taggedjs 2.1.2 → 2.3.26

package/js/setUse.function.d.ts

@@ -0,0 +1,23 @@
+import { Tag } from "./Tag.class.js";
+import { TagSupport } from "./getTagSupport";
+import { Config } from "./state";
+interface TagUse {
+    beforeRender: (tagSupport: TagSupport, ownerTag: Tag) => void;
+    beforeRedraw: (tagSupport: TagSupport, tag: Tag) => void;
+    afterRender: (tagSupport: TagSupport, tag: Tag) => void;
+    beforeDestroy: (tagSupport: TagSupport, tag: Tag) => void;
+}
+export type UseOptions = {
+    beforeRender?: (tagSupport: TagSupport, ownerTag: Tag) => void;
+    beforeRedraw?: (tagSupport: TagSupport, tag: Tag) => void;
+    afterRender?: (tagSupport: TagSupport, tag: Tag) => void;
+    beforeDestroy?: (tagSupport: TagSupport, tag: Tag) => void;
+};
+export declare function setUse(use: UseOptions): void;
+export declare namespace setUse {
+    var tagUse: TagUse[];
+    var memory: Record<string, any> & {
+        stateConfig: Config;
+    };
+}
+export {};

package/js/setUse.function.js

@@ -0,0 +1,14 @@
+const tagUse = [];
+export function setUse(use) {
+    // must provide defaults
+    const useMe = {
+        beforeRender: use.beforeRender || (() => undefined),
+        beforeRedraw: use.beforeRedraw || (() => undefined),
+        afterRender: use.afterRender || (() => undefined),
+        beforeDestroy: use.beforeDestroy || (() => undefined),
+    };
+    setUse.tagUse.push(useMe);
+}
+setUse.tagUse = tagUse;
+setUse.memory = {};
+//# sourceMappingURL=setUse.function.js.map

package/js/setUse.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setUse.function.js","sourceRoot":"","sources":["../ts/setUse.function.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,GAAa,EAAE,CAAA;AAsB3B,MAAM,UAAU,MAAM,CAAC,GAAe;IACpC,wBAAwB;IACxB,MAAM,KAAK,GAAW;QACpB,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACnD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACnD,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACjD,aAAa,EAAE,GAAG,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACtD,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;AACtB,MAAM,CAAC,MAAM,GAAG,EAAkD,CAAA"}

package/js/state.d.ts

@@ -1,21 +1,20 @@
-import { TagSupport } from "./getTagSupport.js";
-export type StateConfig = ((x?: any) => [any, any]);
-export type StateConfigArray = StateConfig[];
-export type State = {
-    newest: StateConfigArray;
-    oldest?: StateConfigArray;
-};
-export type StateTagSupport = TagSupport & {
-    state?: State;
+export type StateConfig = (x?: any) => [any, any];
+type StateConfigItem = {
+    callback?: StateConfig;
+    lastValue?: any;
+    defaultValue?: any;
 };
-export declare const config: {
+export type StateConfigArray = StateConfigItem[];
+export type Config = {
     array: StateConfigArray;
     rearray: StateConfigArray;
 };
-/**
- * @template T
- * @param {T} defaultValue
- * @returns {T}
- */
-export declare function state<T>(defaultValue: T, getSetMethod?: (x: T) => [T, T]): T;
-export declare function getStateValue(state: StateConfig): any;
+export type State = {
+    newest: StateConfigArray;
+};
+/** Used for variables that need to remain the same variable during render passes */
+export declare function state<T>(defaultValue: T | (() => T)): (x?: (y: T) => [T, T]) => T;
+export declare function getStateValue(state: StateConfigItem): any;
+export declare class StateEchoBack {
+}
+export {};

package/js/state.js

@@ -1,63 +1,108 @@
-import { setUse } from "./tagRunner.js";
-export const config = {
-    array: [],
-    rearray: [],
+import { setUse } from "./setUse.function.js";
+// TODO: rename
+setUse.memory.stateConfig = {
+    array: [], // state memory on the first render
+    rearray: [], // state memory to be used before the next render
 };
-/**
- * @template T
- * @param {T} defaultValue
- * @returns {T}
- */
-export function state(defaultValue, getSetMethod) {
+/** Used for variables that need to remain the same variable during render passes */
+export function state(defaultValue) {
+    const config = setUse.memory.stateConfig;
+    let getSetMethod;
     const restate = config.rearray[config.array.length];
     if (restate) {
-        const oldValue = getStateValue(restate);
-        config.array.push(getSetMethod);
-        return oldValue; // return old value instead
+        let oldValue = getStateValue(restate);
+        getSetMethod = (x => [oldValue, oldValue = x]);
+        const push = {
+            callback: getSetMethod,
+            lastValue: oldValue,
+            defaultValue: restate.defaultValue,
+        };
+        config.array.push(push);
+        return (y) => {
+            push.callback = y || (x => [oldValue, oldValue = x]);
+            return oldValue;
+        };
     }
-    config.array.push(getSetMethod);
-    return defaultValue;
+    const defaultFn = defaultValue instanceof Function ? defaultValue : () => defaultValue;
+    let initValue = defaultFn();
+    getSetMethod = (x => [initValue, initValue = x]);
+    const push = {
+        callback: getSetMethod,
+        lastValue: initValue,
+        defaultValue: initValue,
+    };
+    config.array.push(push);
+    // return initValue
+    return (y) => {
+        push.callback = y || (x => [initValue, initValue = x]);
+        return initValue;
+    };
 }
 setUse({
-    beforeRender: (tagSupport) => {
-        tagSupport.state = tagSupport.state || {
-            newest: [], // oldest: [],
-        };
-    },
-    beforeRedraw: (tagSupport) => {
-        const state = tagSupport.state;
-        config.rearray.length = 0;
-        if (state?.newest.length) {
-            // state.oldest = [...state.newest]
-            config.rearray.push(...state.newest);
-        }
-    },
-    afterRender: (tagSupport) => {
+    beforeRender: (tagSupport) => initState(tagSupport),
+    beforeRedraw: (tagSupport) => initState(tagSupport),
+    afterRender: (tagSupport, tag) => {
+        const state = tagSupport.memory.state;
+        const config = setUse.memory.stateConfig;
         if (config.rearray.length) {
             if (config.rearray.length !== config.array.length) {
-                throw new Error(`States lengths mismatched ${config.rearray.length} !== ${config.array.length}`);
+                const message = `States lengths mismatched ${config.rearray.length} !== ${config.array.length}`;
+                console.error(message, {
+                    oldStates: config.array,
+                    newStates: config.rearray,
+                    component: tagSupport.templater?.wrapper.original
+                });
+                throw new Error(message);
             }
         }
-        config.rearray.length = 0; // clean up any previous runs
-        const state = tagSupport.state;
-        state.newest.length = 0;
-        state.newest.push(...config.array);
-        state.oldest = state.oldest || [...config.array]; // always preserve oldest
-        config.array.length = 0;
+        // config.rearray.length = 0 // clean up any previous runs
+        config.rearray = []; // clean up any previous runs
+        // state.newest.length = 0
+        // state.newest.push(...config.array) as any
+        state.newest = [...config.array];
+        // config.array.length = 0
+        config.array = [];
     }
 });
-export function getStateValue(state) {
-    const [oldValue] = state(EchoBack); // get value and set to undefined
-    const [checkValue] = state(oldValue); // set back to original value
-    if (checkValue !== EchoBack) {
-        const error = new Error('State property not used correctly.\n\n' +
+export function getStateValue(
+// state: StateConfig,
+state) {
+    const callback = state.callback;
+    if (!callback) {
+        return state.defaultValue;
+    }
+    const oldState = callback(StateEchoBack); // get value and set to undefined
+    const [oldValue] = oldState;
+    const [checkValue] = callback(oldValue); // set back to original value
+    if (checkValue !== StateEchoBack) {
+        const message = 'State property not used correctly.\n\n' +
             'For "let" state use `let name = state(default, x => [name, name = x])`\n\n' +
             'For "const" state use `const name = state(default)`\n\n' +
-            'Problem function:\n' + state + '\n');
-        throw error;
+            'Problem function:\n' + state + '\n';
+        // console.error(message, {callback, oldState, oldValue, checkValue})
+        throw new Error(message);
     }
     return oldValue;
 }
-class EchoBack {
+export class StateEchoBack {
+}
+function initState(tagSupport) {
+    const state = tagSupport.memory.state;
+    const config = setUse.memory.stateConfig;
+    // TODO: This guard may no longer be needed
+    if (config.rearray.length) {
+        const message = 'last array not cleared';
+        console.error(message, {
+            config,
+            component: tagSupport.templater?.wrapper.original,
+            state,
+        });
+        throw message;
+    }
+    // TODO: this maybe redundant and not needed
+    config.rearray = []; // .length = 0
+    if (state?.newest.length) {
+        config.rearray.push(...state.newest);
+    }
 }
 //# sourceMappingURL=state.js.map

package/js/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../ts/state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAevC,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE,EAAsB;IAC7B,OAAO,EAAE,EAAsB;CAChC,CAAA;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK,CACnB,YAAe,EACf,YAA+B;IAE/B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACnD,IAAG,OAAO,EAAE,CAAC;QACX,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;QACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAE,YAAmB,CAAE,CAAA;QACxC,OAAO,QAAQ,CAAA,CAAC,2BAA2B;IAC7C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAmB,CAAC,CAAA;IACtC,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,CAAC,UAA2B,EAAE,EAAE;QAC5C,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI;YACrC,MAAM,EAAE,EAAE,EAAC,cAAc;SAC1B,CAAA;IACH,CAAC;IACD,YAAY,EAAE,CACZ,UAA2B,EAC3B,EAAE;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;QAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,IAAG,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YACxB,mCAAmC;YACnC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IACD,WAAW,EAAE,CACX,UAA2B,EAC3B,EAAE;QACF,IAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACzB,IAAG,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,OAAO,CAAC,MAAM,QAAQ,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;YAClG,CAAC;QACH,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,6BAA6B;QAEvD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAc,CAAA;QACvC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;QACvB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAQ,CAAA;QACzC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,yBAAyB;QAC1E,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;IACzB,CAAC;CACF,CAAC,CAAA;AAGF,MAAM,UAAU,aAAa,CAAC,KAAkB;IAC9C,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA,CAAC,iCAAiC;IACpE,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAE,QAAQ,CAAE,CAAA,CAAC,6BAA6B;IAEpE,IAAG,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wCAAwC;YACxC,4EAA4E;YAC5E,yDAAyD;YACzD,qBAAqB,GAAG,KAAK,GAAE,IAAI,CAAC,CAAA;QACtC,MAAM,KAAK,CAAA;IACb,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,QAAQ;CAAG"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../ts/state.ts"],"names":[],"mappings":"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"}

package/js/tag.d.ts

@@ -1,17 +1,7 @@
 import { Tag } from "./Tag.class.js";
-export type Props = unknown;
-export type Wrapper = () => Tag;
-export declare class TemplaterResult {
-    props: Props;
-    newProps: Props;
-    cloneProps: Props;
-    tagged: boolean;
-    wrapper: Wrapper;
-    newest?: Tag;
-    oldest?: Tag;
-    redraw?: () => Tag | undefined;
-}
-type TagResult = (props: Props, // props or children
-children?: Tag) => Tag;
-export declare function tag<T>(tagComponent: T | TagResult): T;
-export {};
+import { TagComponent } from "./templater.utils.js";
+export declare const tags: TagComponent[];
+export type TagEnv = {
+    children?: Tag;
+};
+export declare function tag<T>(tagComponent: T | TagComponent): T;

package/js/tag.js

@@ -1,57 +1,46 @@
-import { Tag } from "./Tag.class.js";
-import { deepClone } from "./deepFunctions.js";
-export class TemplaterResult {
-    props;
-    newProps;
-    cloneProps;
-    tagged;
-    wrapper;
-    newest;
-    oldest;
-    redraw;
-}
+import { isTagInstance } from "./isInstance.js";
+import { setUse } from "./setUse.function.js";
+import { TemplaterResult, getNewProps } from "./templater.utils.js";
+export const tags = [];
+let tagCount = 0;
 export function tag(tagComponent) {
-    return ((props, children) => {
-        const callback = (toCall, callWith) => {
-            const callbackResult = toCall(...callWith);
-            templater.newest?.ownerTag?.tagSupport.render();
-            return callbackResult;
-        };
-        const isPropTag = props instanceof Tag;
-        const watchProps = isPropTag ? 0 : props;
-        const newProps = resetFunctionProps(watchProps, callback);
+    const result = (function tagWrapper(props, children) {
+        const isPropTag = isTagInstance(props);
+        const templater = new TemplaterResult(props);
+        const newProps = getNewProps(props, templater);
         let argProps = newProps;
         if (isPropTag) {
             children = props;
             argProps = noPropsGiven;
         }
-        const wrapper = () => tagComponent(argProps, children);
-        const templater = new TemplaterResult();
+        function innerTagWrap() {
+            const originalFunction = innerTagWrap.original;
+            const props = templater.tagSupport.props; // argProps
+            const tag = originalFunction(props, children);
+            tag.setSupport(templater.tagSupport);
+            return tag;
+        }
+        innerTagWrap.original = tagComponent;
         templater.tagged = true;
-        templater.props = props; // used to call function
-        templater.newProps = newProps;
-        templater.cloneProps = deepClone(newProps);
-        templater.wrapper = wrapper;
+        templater.wrapper = innerTagWrap;
         return templater;
     }); // we override the function provided and pretend original is what's returned
+    updateResult(result, tagComponent);
+    // group tags together and have hmr pickup
+    updateComponent(tagComponent);
+    tags.push(tagComponent);
+    return result;
+}
+function updateResult(result, tagComponent) {
+    result.isTag = true;
+    result.original = tagComponent;
+}
+function updateComponent(tagComponent) {
+    tagComponent.tags = tags;
+    tagComponent.setUse = setUse;
+    tagComponent.tagIndex = ++tagCount;
 }
 class NoPropsGiven {
 }
 const noPropsGiven = new NoPropsGiven();
-function resetFunctionProps(props, callback) {
-    if (typeof (props) !== 'object') {
-        return props;
-    }
-    const newProps = { ...props };
-    Object.entries(newProps).forEach(([name, value]) => {
-        if (value instanceof Function) {
-            newProps[name] = (...args) => {
-                return callback(value, args);
-            };
-            return;
-        }
-        newProps[name] = value;
-    });
-    return newProps;
-}
 //# sourceMappingURL=tag.js.map

package/js/tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.js","sourceRoot":"","sources":["../ts/tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAM9C,MAAM,OAAO,eAAe;IAC1B,KAAK,CAAO;IACZ,QAAQ,CAAO;IACf,UAAU,CAAO;IACjB,MAAM,CAAU;IAChB,OAAO,CAAU;IAEjB,MAAM,CAAM;IACZ,MAAM,CAAM;IACZ,MAAM,CAAwB;CAC/B;AAOD,MAAM,UAAU,GAAG,CACjB,YAA2B;IAE3B,OAAO,CAAC,CAAC,KAAmB,EAAE,QAAc,EAAE,EAAE;QAC9C,MAAM,QAAQ,GAAG,CAAC,MAAW,EAAE,QAAa,EAAE,EAAE;YAC9C,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAA;YAC1C,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,CAAA;YAC/C,OAAO,cAAc,CAAA;QACvB,CAAC,CAAA;QAED,MAAM,SAAS,GAAG,KAAK,YAAY,GAAG,CAAA;QACtC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACxC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEzD,IAAI,QAAQ,GAAG,QAAQ,CAAA;QACvB,IAAG,SAAS,EAAE,CAAC;YACb,QAAQ,GAAG,KAAK,CAAA;YAChB,QAAQ,GAAG,YAAY,CAAA;QACzB,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAE,YAA0B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAErE,MAAM,SAAS,GAAoB,IAAI,eAAe,EAAE,CAAA;QACxD,SAAS,CAAC,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA,CAAC,wBAAwB;QAChD,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAC7B,SAAS,CAAC,UAAU,GAAG,SAAS,CAAE,QAAQ,CAAE,CAAA;QAC5C,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;QAE3B,OAAO,SAAS,CAAA;IAClB,CAAC,CAAM,CAAA,CAAC,4EAA4E;AACtF,CAAC;AAED,MAAM,YAAY;CAAG;AACrB,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAA;AAEvC,SAAS,kBAAkB,CACzB,KAAU,EACV,QAAa;IAEb,IAAG,OAAM,CAAC,KAAK,CAAC,KAAG,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,EAAC,GAAG,KAAK,EAAC,CAAA;IAE3B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,IAAG,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;gBAClC,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YAC9B,CAAC,CAAA;YACD,OAAM;QACR,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC"}
+{"version":3,"file":"tag.js","sourceRoot":"","sources":["../ts/tag.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAgB,eAAe,EAAW,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE1F,MAAM,CAAC,MAAM,IAAI,GAAmB,EAAE,CAAA;AAEtC,IAAI,QAAQ,GAAG,CAAC,CAAA;AAWhB,MAAM,UAAU,GAAG,CACjB,YAA8B;IAE9B,MAAM,MAAM,GAAG,CAAC,SAAS,UAAU,CACjC,KAA8B,EAC9B,QAAc;QAEd,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;QACtC,MAAM,SAAS,GAAoB,IAAI,eAAe,CAAC,KAAK,CAAC,CAAA;QAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAE9C,IAAI,QAAQ,GAAG,QAAQ,CAAA;QACvB,IAAG,SAAS,EAAE,CAAC;YACb,QAAQ,GAAG,KAAY,CAAA;YACvB,QAAQ,GAAG,YAAY,CAAA;QACzB,CAAC;QAED,SAAS,YAAY;YACnB,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAwB,CAAA;YAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA,CAAC,WAAW;YACpD,MAAM,GAAG,GAAG,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YAC7C,GAAG,CAAC,UAAU,CAAE,SAAS,CAAC,UAAU,CAAE,CAAA;YACtC,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAA;QAGpC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,CAAC,OAAO,GAAG,YAAuB,CAAA;QAE3C,OAAO,SAAS,CAAA;IAClB,CAAC,CAAM,CAAA,CAAC,4EAA4E;IAEpF,YAAY,CAAC,MAAM,EAAE,YAA4B,CAAC,CAAA;IAElD,0CAA0C;IAC1C,eAAe,CAAC,YAAY,CAAC,CAAA;IAC7B,IAAI,CAAC,IAAI,CAAC,YAA4B,CAAC,CAAA;IAEvC,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,YAAY,CACnB,MAAW,EACX,YAA0B;IAE1B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,MAAM,CAAC,QAAQ,GAAG,YAAY,CAAA;AAChC,CAAC;AAED,SAAS,eAAe,CACtB,YAAiB;IAEjB,YAAY,CAAC,IAAI,GAAG,IAAI,CAAA;IACxB,YAAY,CAAC,MAAM,GAAG,MAAM,CAAA;IAC5B,YAAY,CAAC,QAAQ,GAAG,EAAE,QAAQ,CAAA;AACpC,CAAC;AACD,MAAM,YAAY;CAAG;AACrB,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAA"}

package/js/tagElement.d.ts

@@ -0,0 +1,14 @@
+import { TagSupport } from "./getTagSupport.js";
+import { TagComponent, TemplaterResult } from "./templater.utils.js";
+import { Tag } from "./Tag.class.js";
+export declare function tagElement(app: TagComponent, // (...args: unknown[]) => TemplaterResult,
+element: HTMLElement | Element, props: unknown): {
+    tag: Tag;
+    tags: TagComponent[];
+};
+export declare function applyTagUpdater(wrapper: TemplaterResult): {
+    tag: Tag;
+    tagSupport: TagSupport;
+};
+/** Overwrites arguments.tagSupport.mutatingRender */
+export declare function addAppTagRender(tagSupport: TagSupport, tag: Tag): void;

package/js/tagElement.js

@@ -0,0 +1,60 @@
+import { runBeforeRender } from "./tagRunner.js";
+const appElements = [];
+export function tagElement(app, // (...args: unknown[]) => TemplaterResult,
+element, props) {
+    const appElmIndex = appElements.findIndex(appElm => appElm.element === element);
+    if (appElmIndex >= 0) {
+        appElements[appElmIndex].tag.destroy();
+        appElements.splice(appElmIndex, 1);
+        // an element already had an app on it
+        console.warn('Found and destroyed app element already rendered to element', { element });
+    }
+    // Create the app which returns [props, runOneTimeFunction]
+    const wrapper = app(props);
+    // have a function setup and call the tagWrapper with (props, {update, async, on})
+    const result = applyTagUpdater(wrapper);
+    const { tag, tagSupport } = result;
+    tag.appElement = element;
+    addAppTagRender(tagSupport, tag);
+    // const context = tag.updateValues(tag.values)
+    const templateElm = document.createElement('template');
+    templateElm.setAttribute('tag-detail', 'app-template-placeholder');
+    element.appendChild(templateElm);
+    tag.buildBeforeElement(templateElm);
+    element.setUse = app.original.setUse;
+    appElements.push({ element, tag });
+    return { tag, tags: app.original.tags };
+}
+export function applyTagUpdater(wrapper) {
+    const tagSupport = wrapper.tagSupport; // getTagSupport(0, wrapper)
+    runBeforeRender(tagSupport, undefined);
+    // Call the apps function for our tag templater
+    // const templater = tagSupport.templater as TemplaterResult
+    const tag = wrapper.wrapper(); // templater.wrapper()
+    tag.tagSupport = tagSupport;
+    tag.afterRender();
+    return { tag, tagSupport };
+}
+/** Overwrites arguments.tagSupport.mutatingRender */
+export function addAppTagRender(tagSupport, tag) {
+    let lastTag;
+    tagSupport.mutatingRender = () => {
+        tag.beforeRedraw();
+        const templater = tagSupport.templater; // wrapper
+        const fromTag = lastTag = templater.wrapper();
+        // tagSupport.props = fromTag.tagSupport.props
+        tagSupport.latestProps = fromTag.tagSupport.props;
+        tagSupport.latestClonedProps = fromTag.tagSupport.clonedProps;
+        fromTag.setSupport(tagSupport);
+        tag.afterRender();
+        tag.updateByTag(fromTag);
+        /*
+        if(lastTag) {
+          lastTag.destroy({stagger: 0})
+        }
+        */
+        tagSupport.newest = fromTag;
+        return lastTag;
+    };
+}
+//# sourceMappingURL=tagElement.js.map

package/js/tagElement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagElement.js","sourceRoot":"","sources":["../ts/tagElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIhD,MAAM,WAAW,GAAmC,EAAE,CAAA;AAEtD,MAAM,UAAU,UAAU,CACxB,GAAiB,EAAE,2CAA2C;AAC9D,OAA8B,EAC9B,KAAc;IAEd,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;IAC/E,IAAG,WAAW,IAAI,CAAC,EAAE,CAAC;QACpB,WAAW,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QACtC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAClC,sCAAsC;QACtC,OAAO,CAAC,IAAI,CAAC,6DAA6D,EAAE,EAAC,OAAO,EAAC,CAAC,CAAA;IACxF,CAAC;IAED,2DAA2D;IAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAA+B,CAAA;IAExD,kFAAkF;IAClF,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACvC,MAAM,EAAC,GAAG,EAAE,UAAU,EAAC,GAAG,MAAM,CAAA;IAEhC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAA;IAExB,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAEhC,+CAA+C;IAE/C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IACtD,WAAW,CAAC,YAAY,CAAC,YAAY,EAAC,0BAA0B,CAAC,CAAA;IACjE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;IAEhC,GAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAIlC;IAAC,OAAe,CAAC,MAAM,GAAI,GAAW,CAAC,QAAQ,CAAC,MAAM,CAAA;IAEvD,WAAW,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,CAAC,CAAA;IAEhC,OAAO,EAAC,GAAG,EAAE,IAAI,EAAG,GAAW,CAAC,QAAQ,CAAC,IAAI,EAAC,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,OAAwB;IAExB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA,CAAC,4BAA4B;IAClE,eAAe,CAAC,UAAU,EAAE,SAAuB,CAAC,CAAA;IAEpD,+CAA+C;IAC/C,4DAA4D;IAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA,CAAC,sBAAsB;IAEpD,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC3B,GAAG,CAAC,WAAW,EAAE,CAAA;IAEjB,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,eAAe,CAC7B,UAAsB,EACtB,GAAQ;IAER,IAAI,OAAO,CAAA;IACX,UAAU,CAAC,cAAc,GAAG,GAAG,EAAE;QAC/B,GAAG,CAAC,YAAY,EAAE,CAAA;QAElB,MAAM,SAAS,GAAG,UAAU,CAAC,SAA4B,CAAA,CAAC,UAAU;QACpE,MAAM,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,CAAA;QAE7C,8CAA8C;QAC9C,UAAU,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAA;QACjD,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAA;QAE7D,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAC9B,GAAG,CAAC,WAAW,EAAE,CAAA;QACjB,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QAExB;;;;UAIE;QAEF,UAAU,CAAC,MAAM,GAAG,OAAO,CAAA;QAE3B,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;AACH,CAAC"}

package/js/tagGateway.function.d.ts

@@ -0,0 +1,14 @@
+import { Props } from "./Props.js";
+import { TagComponent } from "./templater.utils.js";
+export type dispatchEvent = (name: string, eventData: EventData) => void;
+export type GatewayProps = Props & {
+    [key: string]: unknown;
+    dispatchEvent: dispatchEvent;
+};
+export declare function checkGateways(): void;
+export declare const tagGateway: (component: TagComponent) => {
+    id: string;
+};
+export type EventData = {
+    detail: Record<string, any>;
+};

package/js/tagGateway.function.js

@@ -0,0 +1,138 @@
+import { redrawTag } from "./redrawTag.function.js";
+import { tagElement } from "./tagElement.js";
+export function checkGateways() {
+    Object.entries(gateways).forEach(([id, gateway]) => checkGateway(gateway));
+}
+function checkGateway(gateway) {
+    const { id, observer, tag } = gateway;
+    if (document.getElementById(id)) {
+        return true;
+    }
+    observer.disconnect();
+    tag.destroy();
+    delete gateways[id];
+    return false;
+}
+const namedTimeouts = {};
+export const tagGateway = function tagGateway(component) {
+    const componentString = functionToHtmlId(component);
+    const id = '__tagTemplate_' + componentString;
+    if (namedTimeouts[id]) {
+        return namedTimeouts[id];
+    }
+    let intervalId;
+    let hitCount = 0;
+    const interval = 5;
+    function findElements() {
+        const elements = document.querySelectorAll('#' + id);
+        if (!elements.length) {
+            return elements.length;
+        }
+        // Element has been found, load
+        if (intervalId) {
+            clearInterval(intervalId);
+        }
+        delete namedTimeouts[id];
+        elements.forEach(element => {
+            const updateTag = element.updateTag;
+            if (updateTag) {
+                updateTag();
+                return;
+            }
+            const props = parsePropsString(element);
+            try {
+                const { tag } = tagElement(component, element, props);
+                watchElement(id, element, tag);
+            }
+            catch (err) {
+                console.warn('Failed to render component to element', { component, element, props });
+                throw err;
+            }
+        });
+        return elements.length;
+    }
+    function findElement() {
+        intervalId = setInterval(() => {
+            hitCount = hitCount + interval;
+            if (hitCount >= 2000) {
+                clearInterval(intervalId);
+                throw new Error(`TaggedJs Element ${id} not found`);
+            }
+            findElements();
+        }, interval);
+    }
+    const elementCounts = findElements();
+    if (elementCounts) {
+        return { id };
+    }
+    findElement();
+    namedTimeouts[id] = { id };
+    return namedTimeouts[id];
+};
+function parsePropsString(element) {
+    const propsString = element.getAttribute('props');
+    if (!propsString) {
+        return { element };
+    }
+    try {
+        const props = JSON.parse(propsString);
+        // props.element = element
+        props.dispatchEvent = function (name, eventData) {
+            const event = new CustomEvent(name, eventData);
+            element.dispatchEvent(event);
+        };
+        return props;
+    }
+    catch (err) {
+        console.warn('Failed to parse props on element', { element, propsString });
+        throw err;
+    }
+}
+function watchElement(id, targetNode, tag) {
+    let lastTag = tag;
+    const observer = new MutationObserver((mutationsList, observer) => {
+        if (!checkGateway(gateway)) {
+            return;
+        }
+        for (const mutation of mutationsList) {
+            if (mutation.type === 'attributes') {
+                updateTag();
+            }
+        }
+    });
+    function updateTag() {
+        const templater = tag.tagSupport.templater;
+        const oldProps = templater.tagSupport.props;
+        templater.tagSupport.props = parsePropsString(targetNode);
+        const isSameProps = JSON.stringify(oldProps) === JSON.stringify(templater.tagSupport.props);
+        if (isSameProps) {
+            return; // no reason to update, same props
+        }
+        templater.tagSupport.latestProps = templater.tagSupport.props;
+        const result = redrawTag(lastTag, templater);
+        // update records
+        gateway.tag = lastTag = result.retag;
+    }
+    ;
+    targetNode.updateTag = updateTag;
+    const gateway = { id, tag, observer };
+    gateways[id] = gateway;
+    // Configure the observer to watch for changes in child nodes and attributes
+    const config = { attributes: true };
+    // Start observing the target node for specified changes
+    observer.observe(targetNode, config);
+}
+function functionToHtmlId(func) {
+    // Convert function to string
+    let funcString = func.toString();
+    // Remove spaces and replace special characters with underscores
+    let cleanedString = funcString.replace(/\s+/g, '_')
+        .replace(/[^\w\d]/g, '_');
+    // Ensure the ID starts with a letter
+    if (!/^[a-zA-Z]/.test(cleanedString)) {
+        cleanedString = 'fn_' + cleanedString;
+    }
+    return cleanedString;
+}
+const gateways = {};
+//# sourceMappingURL=tagGateway.function.js.map

package/js/tagGateway.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagGateway.function.js","sourceRoot":"","sources":["../ts/tagGateway.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAW5C,MAAM,UAAU,aAAa;IAC3B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;AAC5E,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB;IACpC,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAC,GAAG,OAAO,CAAA;IAEnC,IAAG,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAC,UAAU,EAAE,CAAA;IACrB,GAAG,CAAC,OAAO,EAAE,CAAA;IAEb,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEnB,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,aAAa,GAAwB,EAAE,CAAA;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,UAAU,CAC3C,SAAuB;IAEvB,MAAM,eAAe,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACnD,MAAM,EAAE,GAAG,gBAAgB,GAAG,eAAe,CAAA;IAE7C,IAAG,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC;QACrB,OAAO,aAAa,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,UAA0B,CAAA;IAC9B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,MAAM,QAAQ,GAAG,CAAC,CAAA;IAElB,SAAS,YAAY;QACnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,CAAC,GAAG,GAAG,EAAE,CAAC,CAAA;QAEpD,IAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,QAAQ,CAAC,MAAM,CAAA;QACxB,CAAC;QAED,+BAA+B;QAC/B,IAAG,UAAU,EAAE,CAAC;YACd,aAAa,CAAC,UAAU,CAAC,CAAA;QAC3B,CAAC;QACD,OAAO,aAAa,CAAC,EAAE,CAAC,CAAA;QAExB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,MAAM,SAAS,GAAI,OAAe,CAAC,SAAS,CAAA;YAC5C,IAAG,SAAS,EAAE,CAAC;gBACb,SAAS,EAAE,CAAA;gBACX,OAAM;YACR,CAAC;YAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;YAEvC,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;gBACrD,YAAY,CAAC,EAAE,EAAE,OAAsB,EAAE,GAAG,CAAC,CAAA;YAC/C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC,CAAA;gBAClF,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAC,MAAM,CAAA;IACxB,CAAC;IAED,SAAS,WAAW;QAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5B,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;YAE9B,IAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACpB,aAAa,CAAC,UAAU,CAAC,CAAA;gBACzB,MAAM,IAAI,KAAK,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAA;YACrD,CAAC;YAED,YAAY,EAAE,CAAA;QAChB,CAAC,EAAE,QAAQ,CAAC,CAAA;IACd,CAAC;IAED,MAAM,aAAa,GAAG,YAAY,EAAE,CAAA;IACpC,IAAG,aAAa,EAAE,CAAC;QACjB,OAAO,EAAE,EAAE,EAAE,CAAA;IACf,CAAC;IAED,WAAW,EAAE,CAAA;IAEb,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAA;IAE1B,OAAO,aAAa,CAAC,EAAE,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,SAAS,gBAAgB,CACvB,OAAgB;IAEhB,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IACjD,IAAG,CAAC,WAAW,EAAE,CAAC;QAChB,OAAO,EAAC,OAAO,EAAC,CAAA;IAClB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAiB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACnD,0BAA0B;QAC1B,KAAK,CAAC,aAAa,GAAG,UAAS,IAAY,EAAE,SAAoB;YAC/D,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YAC9C,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QAC9B,CAAC,CAAA;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAC,OAAO,EAAE,WAAW,EAAC,CAAC,CAAA;QACxE,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CACnB,EAAU,EACV,UAAuB,EACvB,GAAQ;IAER,IAAI,OAAO,GAAG,GAAG,CAAA;IACjB,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE;QAChE,IAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,OAAM;QACR,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACnC,SAAS,EAAE,CAAA;YACb,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,SAAS,SAAS;QAChB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAA4B,CAAA;QAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QAC3C,SAAS,CAAC,UAAU,CAAC,KAAK,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;QAEzD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAE3F,IAAG,WAAW,EAAE,CAAC;YACf,OAAM,CAAC,kCAAkC;QAC3C,CAAC;QAED,SAAS,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QAE7D,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAE5C,iBAAiB;QACjB,OAAO,CAAC,GAAG,GAAG,OAAO,GAAG,MAAM,CAAC,KAAK,CAAA;IACtC,CAAC;IAED,CAAC;IAAC,UAAkB,CAAC,SAAS,GAAG,SAAS,CAAA;IAE1C,MAAM,OAAO,GAAG,EAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,CAAC,GAAG,OAAO,CAAA;IAEtB,4EAA4E;IAC5E,MAAM,MAAM,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,CAAA;IAEnC,wDAAwD;IACxD,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;AACtC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAS;IACjC,6BAA6B;IAC7B,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAEjC,gEAAgE;IAChE,IAAI,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAEvD,qCAAqC;IACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,aAAa,GAAG,KAAK,GAAG,aAAa,CAAC;IAC1C,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAMD,MAAM,QAAQ,GAA2B,EAAE,CAAA"}