taggedjs 2.4.16 → 2.4.31

package/js/processSubjectComponent.function.d.ts

@@ -1,9 +1,9 @@
 import { TemplaterResult } from './TemplaterResult.class';
-import { Counts } from './interpolateTemplate';
-import { Tag } from './Tag.class';
-import { TagSubject } from './Tag.utils';
+import { Counts } from './interpolations/interpolateTemplate';
+import { TagSubject } from './subject.types';
+import { TagSupport } from './TagSupport.class';
 import { InsertBefore } from './Clones.type';
-export declare function processSubjectComponent(templater: TemplaterResult, subject: TagSubject, insertBefore: InsertBefore, ownerTag: Tag, options: {
+export declare function processSubjectComponent(templater: TemplaterResult, subject: TagSubject, insertBefore: InsertBefore, ownerSupport: TagSupport, options: {
     counts: Counts;
     forceElement?: boolean;
-}): Tag;
+}): TagSupport;

package/js/processSubjectComponent.function.js

@@ -1,12 +1,13 @@
 import { renderWithSupport } from './TemplaterResult.class';
-import { setUse } from './setUse.function';
+import { setUse } from './state';
 import { processTagResult } from './processTagResult.function';
 import { TagSupport } from './TagSupport.class';
-export function processSubjectComponent(templater, subject, insertBefore, ownerTag, options) {
+export function processSubjectComponent(templater, subject, insertBefore, ownerSupport, options) {
     // Check if function component is wrapped in a tag() call
     // TODO: This below check not needed in production mode
     if (templater.tagged !== true) {
-        const original = templater.wrapper.original;
+        const wrapper = templater.wrapper;
+        const original = wrapper.original;
         let name = original.name || original.constructor?.name;
         if (name === 'Function') {
             name = undefined;
@@ -15,43 +16,34 @@ export function processSubjectComponent(templater, subject, insertBefore, ownerT
         const error = new Error(`Not a tag component. Wrap your function with tag(). Example tag(props => html\`\`) on component:\n\n${label}\n\n`);
         throw error;
     }
-    templater.tagSupport = new TagSupport(ownerTag.tagSupport, templater, subject);
-    // templater.oldest = subject.tag?.tagSupport.oldest || templater.oldest
-    if (insertBefore.nodeName != 'TEMPLATE') {
-        throw new Error('9');
-    }
-    templater.global.insertBefore = insertBefore;
-    let retag = subject.tag;
+    const tagSupport = new TagSupport(templater, ownerSupport, subject);
+    let reSupport = subject.tagSupport;
+    const global = tagSupport.global = reSupport?.global || tagSupport.global;
+    global.insertBefore = insertBefore;
     const providers = setUse.memory.providerConfig;
-    providers.ownerTag = ownerTag;
-    const isRedraw = !retag || options.forceElement;
-    if (isRedraw) {
-        retag = redrawSubjectComponent(templater, subject, retag, ownerTag, insertBefore);
+    providers.ownerSupport = ownerSupport;
+    const isRender = !reSupport || options.forceElement;
+    if (isRender) {
+        const support = reSupport || tagSupport;
+        reSupport = renderSubjectComponent(subject, support, ownerSupport);
     }
-    processTagResult(retag, subject, // The element set here will be removed from document. Also result.tag will be added in here
+    processTagResult(reSupport, subject, // The element set here will be removed from document. Also result.tag will be added in here
     insertBefore, // <template end interpolate /> (will be removed)
     options);
-    return retag;
+    return reSupport;
 }
-function redrawSubjectComponent(templater, subject, retag, ownerTag, insertBefore) {
-    const preClones = ownerTag.clones.map(clone => clone);
-    retag = renderWithSupport(templater.tagSupport, subject.tag, // existing tag
-    subject, ownerTag);
-    if (retag.tagSupport.templater.global.newest != retag) {
-        throw new Error('mismatch result newest');
-    }
-    templater.global.newest = retag;
-    if (ownerTag.clones.length > preClones.length) {
-        const myClones = ownerTag.clones.filter(fClone => !preClones.find(clone => clone === fClone));
-        retag.clones.push(...myClones);
-        if (myClones.find(x => x === insertBefore)) {
-            throw new Error('way back here we add marker');
-        }
-    }
-    if (ownerTag.childTags.find(x => x === retag)) {
-        throw new Error('about to reattach tag already present');
+function renderSubjectComponent(subject, reSupport, ownerSupport) {
+    const preClones = ownerSupport.clones.map(clone => clone);
+    reSupport = renderWithSupport(reSupport, subject.tagSupport, // existing tag
+    subject, ownerSupport);
+    reSupport.global.newest = reSupport;
+    // ??? - mirroring add 0
+    // reSupport.ownerTagSupport = ownerSupport
+    if (ownerSupport.clones.length > preClones.length) {
+        const myClones = ownerSupport.clones.filter(fClone => !preClones.find(clone => clone === fClone));
+        reSupport.clones.push(...myClones);
     }
-    ownerTag.childTags.push(retag);
-    return retag;
+    ownerSupport.childTags.push(reSupport);
+    return reSupport;
 }
 //# sourceMappingURL=processSubjectComponent.function.js.map

package/js/processSubjectComponent.function.js.map

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

package/js/processSubjectValue.function.d.ts

@@ -1,11 +1,14 @@
 import { TagArraySubject } from './processTagArray';
 import { TemplaterResult } from './TemplaterResult.class';
 import { Clones, InsertBefore } from './Clones.type';
-import { Tag } from './Tag.class';
-import { Counts } from './interpolateTemplate';
-import { DisplaySubject, TagSubject } from './Tag.utils';
+import { Counts } from './interpolations/interpolateTemplate';
+import { DisplaySubject, TagSubject } from './subject.types';
 import { ValueSubject } from './subject/ValueSubject';
-import { Callback } from './bindSubjectCallback.function';
+import { RegularValue } from './processRegularValue.function';
+import { Callback } from './interpolations/bindSubjectCallback.function';
+import { TagSupport } from './TagSupport.class';
+import { Tag } from './Tag.class';
+import { Subject } from './subject';
 type processOptions = {
     forceElement?: boolean;
     counts: Counts;
@@ -13,9 +16,10 @@ type processOptions = {
 export type ClonesAndPromise = {
     clones: Clones;
 };
-export type InterpolateSubject = TagArraySubject | TagSubject | DisplaySubject | ValueSubject<Callback>;
-export declare function processSubjectValue(value: any | TemplaterResult, subject: InterpolateSubject, // could be tag via result.tag
+export type InterpolateSubject = ValueSubject<undefined> | TagArraySubject | TagSubject | DisplaySubject | ValueSubject<Callback>;
+export type TemplateValue = Tag | TemplaterResult | (Tag | TemplaterResult)[] | RegularValue | Subject<any> | Callback;
+export declare function processSubjectValue(value: TemplateValue, subject: InterpolateSubject, // could be tag via result.tag
 insertBefore: InsertBefore, // <template end interpolate /> (will be removed)
-ownerTag: Tag, // owner
+ownerSupport: TagSupport, // owner
 options: processOptions): Clones | undefined;
 export {};

package/js/processSubjectValue.function.js

@@ -1,11 +1,12 @@
 import { processSubjectComponent } from './processSubjectComponent.function';
-import { isTagArray, isTagComponent, isTagInstance } from './isInstance';
+import { isTagArray, isTagClass, isTagComponent, isTagTemplater } from './isInstance';
 import { processTagArray } from './processTagArray';
 import { processRegularValue } from './processRegularValue.function';
-import { processTag } from './processTag.function';
+import { processTag, tagFakeTemplater } from './processTag.function';
 var ValueTypes;
 (function (ValueTypes) {
     ValueTypes["tag"] = "tag";
+    ValueTypes["templater"] = "templater";
     ValueTypes["tagArray"] = "tag-array";
     ValueTypes["tagComponent"] = "tag-component";
     ValueTypes["value"] = "value";
@@ -14,7 +15,10 @@ function getValueType(value) {
     if (isTagComponent(value)) {
         return ValueTypes.tagComponent;
     }
-    if (isTagInstance(value)) {
+    if (isTagTemplater(value)) {
+        return ValueTypes.templater;
+    }
+    if (isTagClass(value)) {
         return ValueTypes.tag;
     }
     if (isTagArray(value)) {
@@ -22,19 +26,28 @@ function getValueType(value) {
     }
     return ValueTypes.value;
 }
+// export type ExistingValue = TemplaterResult | Tag[] | TagSupport | Function | Subject<unknown> | RegularValue | Tag
 export function processSubjectValue(value, subject, // could be tag via result.tag
 insertBefore, // <template end interpolate /> (will be removed)
-ownerTag, // owner
+ownerSupport, // owner
 options) {
     const valueType = getValueType(value);
     switch (valueType) {
+        case ValueTypes.templater:
+            processTag(value, insertBefore, ownerSupport, subject);
+            return;
         case ValueTypes.tag:
-            processTag(value, subject, insertBefore, ownerTag);
+            const tag = value;
+            let templater = tag.templater;
+            if (!templater) {
+                templater = tagFakeTemplater(tag);
+            }
+            processTag(templater, insertBefore, ownerSupport, subject);
             return;
         case ValueTypes.tagArray:
-            return processTagArray(subject, value, insertBefore, ownerTag, options);
+            return processTagArray(subject, value, insertBefore, ownerSupport, options);
         case ValueTypes.tagComponent:
-            processSubjectComponent(value, subject, insertBefore, ownerTag, options);
+            processSubjectComponent(value, subject, insertBefore, ownerSupport, options);
             return;
     }
     processRegularValue(value, subject, insertBefore);

package/js/processSubjectValue.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processSubjectValue.function.js","sourceRoot":"","sources":["../ts/processSubjectValue.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAOpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,IAAK,UAKJ;AALD,WAAK,UAAU;IACb,yBAAW,CAAA;IACX,oCAAsB,CAAA;IACtB,4CAA8B,CAAA;IAC9B,6BAAe,CAAA;AACjB,CAAC,EALI,UAAU,KAAV,UAAU,QAKd;AAED,SAAS,YAAY,CAAC,KAAU;IAC9B,IAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAC,YAAY,CAAA;IAChC,CAAC;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAC,GAAG,CAAA;IACvB,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,UAAU,CAAC,QAAQ,CAAA;IAC5B,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAA;AACzB,CAAC;AAcD,MAAM,UAAU,mBAAmB,CACjC,KAA4B,EAC5B,OAA2B,EAAE,8BAA8B;AAC3D,YAA0B,EAAE,iDAAiD;AAC7E,QAAa,EAAE,QAAQ;AACvB,OAAuB;IAEvB,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAErC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,GAAG;YACjB,UAAU,CACR,KAAK,EACL,OAAqB,EACrB,YAAY,EACZ,QAAQ,CACT,CAAA;YACD,OAAM;QAER,KAAK,UAAU,CAAC,QAAQ;YACtB,OAAO,eAAe,CACpB,OAA0B,EAC1B,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,OAAO,CACR,CAAA;QAEH,KAAK,UAAU,CAAC,YAAY;YAC1B,uBAAuB,CACrB,KAAwB,EACxB,OAAqB,EACrB,YAAY,EACZ,QAAQ,EACR,OAAO,CACR,CAAA;YACD,OAAM;IACV,CAAC;IAED,mBAAmB,CACjB,KAAK,EACL,OAAyB,EACzB,YAAY,CACb,CAAA;AACH,CAAC"}
+{"version":3,"file":"processSubjectValue.function.js","sourceRoot":"","sources":["../ts/processSubjectValue.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAMpE,OAAO,EAAgB,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAElF,OAAO,EAAoB,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAKtF,IAAK,UAMJ;AAND,WAAK,UAAU;IACb,yBAAW,CAAA;IACX,qCAAuB,CAAA;IACvB,oCAAsB,CAAA;IACtB,4CAA8B,CAAA;IAC9B,6BAAe,CAAA;AACjB,CAAC,EANI,UAAU,KAAV,UAAU,QAMd;AAED,SAAS,YAAY,CAAC,KAAU;IAC9B,IAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAC,YAAY,CAAA;IAChC,CAAC;IAED,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC,SAAS,CAAA;IAC7B,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,UAAU,CAAC,GAAG,CAAA;IACvB,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,UAAU,CAAC,QAAQ,CAAA;IAC5B,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAA;AACzB,CAAC;AAgBD,sHAAsH;AAEtH,MAAM,UAAU,mBAAmB,CACjC,KAAoB,EACpB,OAA2B,EAAE,8BAA8B;AAC3D,YAA0B,EAAE,iDAAiD;AAC7E,YAAwB,EAAE,QAAQ;AAClC,OAAuB;IAEvB,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAErC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,SAAS;YACvB,UAAU,CACR,KAAwB,EACxB,YAAY,EACZ,YAAY,EACZ,OAAqB,CACtB,CAAA;YACD,OAAM;QAER,KAAK,UAAU,CAAC,GAAG;YACjB,MAAM,GAAG,GAAG,KAAY,CAAA;YACxB,IAAI,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAE7B,IAAG,CAAC,SAAS,EAAE,CAAC;gBACd,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACnC,CAAC;YAED,UAAU,CACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,OAAqB,CACtB,CAAA;YACD,OAAM;QAER,KAAK,UAAU,CAAC,QAAQ;YACtB,OAAO,eAAe,CACpB,OAA0B,EAC1B,KAAkC,EAClC,YAAY,EACZ,YAAY,EACZ,OAAO,CACR,CAAA;QAEH,KAAK,UAAU,CAAC,YAAY;YAC1B,uBAAuB,CACrB,KAAwB,EACxB,OAAqB,EACrB,YAAY,EACZ,YAAY,EACZ,OAAO,CACR,CAAA;YACD,OAAM;IACV,CAAC;IAED,mBAAmB,CACjB,KAAqB,EACrB,OAAyB,EACzB,YAAY,CACb,CAAA;AACH,CAAC"}

package/js/processTag.function.d.ts

@@ -1,7 +1,11 @@
 import { InsertBefore } from './Clones.type';
 import { Tag } from './Tag.class';
-import { TagSubject } from './Tag.utils';
+import { TagSubject } from './subject.types';
+import { TagSupport } from './TagSupport.class';
+import { TemplaterResult } from './TemplaterResult.class';
 /** Could be a regular tag or a component. Both are Tag.class */
-export declare function processTag(tag: Tag, subject: TagSubject, // could be tag via result.tag
-insertBefore: InsertBefore, ownerTag: Tag): void;
-export declare function applyFakeTemplater(tag: Tag, ownerTag: Tag, subject: TagSubject): void;
+export declare function processTag(templater: TemplaterResult, insertBefore: InsertBefore, ownerSupport: TagSupport, // owner
+subject: TagSubject): void;
+export declare function setupNewTemplater(tagSupport: TagSupport, ownerSupport: TagSupport, subject: TagSubject): void;
+export declare function tagFakeTemplater(tag: Tag): TemplaterResult;
+export declare function getFakeTemplater(): TemplaterResult;

package/js/processTag.function.js

@@ -1,59 +1,43 @@
-import { isTagInstance } from './isInstance';
 import { TagSupport } from './TagSupport.class';
 import { ValueSubject } from './subject';
 /** Could be a regular tag or a component. Both are Tag.class */
-export function processTag(tag, subject, // could be tag via result.tag
-insertBefore, ownerTag) {
+export function processTag(templater, insertBefore, ownerSupport, // owner
+subject) {
+    let tagSupport = subject.tagSupport;
     // first time seeing this tag?
-    if (!tag.tagSupport) {
-        if (!isTagInstance(tag)) {
-            throw new Error('issue non-tag here');
-        }
-        applyFakeTemplater(tag, ownerTag, subject);
-        if (ownerTag.childTags.find(x => x === tag)) {
-            throw new Error('about to reattach tag already present - 5');
-        }
-        ownerTag.childTags.push(tag);
+    if (!tagSupport) {
+        tagSupport = new TagSupport(templater, ownerSupport, subject);
+        setupNewTemplater(tagSupport, ownerSupport, subject);
+        ownerSupport.childTags.push(tagSupport);
     }
-    tag.ownerTag = ownerTag;
-    if (insertBefore.tagName !== 'TEMPLATE') {
-        throw new Error(`processTag.function.ts - insertBefore is not TEMPLATE ${insertBefore.tagName}`);
-    }
-    tag.buildBeforeElement(insertBefore, {
+    subject.tagSupport = tagSupport;
+    tagSupport.ownerTagSupport = ownerSupport;
+    tagSupport.buildBeforeElement(insertBefore, {
         counts: { added: 0, removed: 0 },
         forceElement: true,
     });
 }
-export function applyFakeTemplater(tag, ownerTag, subject) {
-    if (!ownerTag) {
-        throw new Error('no owner error');
-    }
-    const fakeTemplater = getFakeTemplater();
-    tag.tagSupport = new TagSupport(ownerTag.tagSupport, fakeTemplater, // the template is provided via html`` call
-    subject);
-    fakeTemplater.global.oldest = tag;
-    fakeTemplater.global.newest = tag;
-    fakeTemplater.tagSupport = tag.tagSupport;
+export function setupNewTemplater(tagSupport, ownerSupport, subject) {
+    tagSupport.global.oldest = tagSupport;
+    tagSupport.global.newest = tagSupport;
     // asking me to render will cause my parent to render
-    tag.ownerTag = ownerTag;
+    tagSupport.ownerTagSupport = ownerSupport;
+    subject.tagSupport = tagSupport;
+}
+export function tagFakeTemplater(tag) {
+    const templater = getFakeTemplater();
+    templater.tag = tag;
+    tag.templater = templater;
+    return templater;
 }
-function getFakeTemplater() {
+export function getFakeTemplater() {
     return {
-        global: {
-            renderCount: 0,
-            providers: [],
-            context: {},
-            subscriptions: [],
-            deleted: false,
-            newestTemplater: {},
-        },
         children: new ValueSubject([]), // no children
         props: {},
         isTag: true,
         isTemplater: false,
         tagged: false,
-        wrapper: (() => undefined),
-        tagSupport: {},
+        // wrapper: (() => undefined) as unknown as Wrapper,
     };
 }
 //# sourceMappingURL=processTag.function.js.map

package/js/processTag.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processTag.function.js","sourceRoot":"","sources":["../ts/processTag.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAI5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,gEAAgE;AAChE,MAAM,UAAU,UAAU,CACxB,GAAQ,EACR,OAAmB,EAAE,8BAA8B;AACnD,YAA0B,EAC1B,QAAa;IAEb,8BAA8B;IAC9B,IAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QACnB,IAAG,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;QAED,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE1C,IAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC9D,CAAC;QAED,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAU,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAEvB,IAAI,YAAoB,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,yDAA0D,YAAoB,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3G,CAAC;IAED,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QACnC,MAAM,EAAE,EAAC,KAAK,EAAC,CAAC,EAAE,OAAO,EAAC,CAAC,EAAC;QAC5B,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,GAAQ,EACR,QAAa,EACb,OAAmB;IAEnB,IAAG,CAAC,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACnC,CAAC;IACD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,GAAG,CAAC,UAAU,GAAG,IAAI,UAAU,CAC7B,QAAQ,CAAC,UAAU,EACnB,aAAa,EAAE,2CAA2C;IAC1D,OAAO,CACR,CAAA;IAED,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;IACjC,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;IACjC,aAAa,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;IAEzC,qDAAqD;IACrD,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;AACzB,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO;QACL,MAAM,EAAC;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,KAAK;YAEd,eAAe,EAAE,EAAqB;SACvC;QACD,QAAQ,EAAE,IAAI,YAAY,CAAQ,EAAE,CAAC,EAAE,cAAc;QACrD,KAAK,EAAE,EAAW;QAElB,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAuB;QAChD,UAAU,EAAE,EAAgB;KACV,CAAA;AACtB,CAAC"}
+{"version":3,"file":"processTag.function.js","sourceRoot":"","sources":["../ts/processTag.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,gEAAgE;AAChE,MAAM,UAAU,UAAU,CACxB,SAA0B,EAC1B,YAA0B,EAC1B,YAAwB,EAAE,QAAQ;AAClC,OAAmB;IAEnB,IAAI,UAAU,GAAe,OAAO,CAAC,UAAU,CAAA;IAE/C,8BAA8B;IAC9B,IAAG,CAAC,UAAU,EAAE,CAAC;QACf,UAAU,GAAG,IAAI,UAAU,CACzB,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAA;QAED,iBAAiB,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA;QAEpD,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAC/B,UAAU,CAAC,eAAe,GAAG,YAAY,CAAA;IAEzC,UAAU,CAAC,kBAAkB,CAC3B,YAAY,EAAE;QACZ,MAAM,EAAE,EAAC,KAAK,EAAC,CAAC,EAAE,OAAO,EAAC,CAAC,EAAC;QAC5B,YAAY,EAAE,IAAI;KACnB,CACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,UAAsB,EACtB,YAAwB,EACxB,OAAmB;IAEnB,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;IACrC,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;IAErC,qDAAqD;IACrD,UAAU,CAAC,eAAe,GAAG,YAAY,CAAA;IACzC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAAQ;IAER,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAA;IACpC,SAAS,CAAC,GAAG,GAAG,GAAG,CAAA;IACnB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IAEzB,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAQ;QACN,QAAQ,EAAE,IAAI,YAAY,CAAQ,EAAE,CAAC,EAAE,cAAc;QACrD,KAAK,EAAE,EAAW;QAElB,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,KAAK;QACb,oDAAoD;KAClC,CAAA;AACtB,CAAC"}

package/js/processTagArray.d.ts

@@ -1,9 +1,11 @@
 import { Clones, InsertBefore } from './Clones.type';
 import { Tag } from './Tag.class';
 import { ValueSubject } from './subject/ValueSubject';
-import { Counts } from './interpolateTemplate';
+import { Counts } from './interpolations/interpolateTemplate';
+import { TagSupport } from './TagSupport.class';
+import { TemplaterResult } from './TemplaterResult.class';
 export type LastArrayItem = {
-    tag: Tag;
+    tagSupport: TagSupport;
     index: number;
     deleted?: boolean;
 };
@@ -13,9 +15,9 @@ export type TagArraySubject = ValueSubject<Tag[]> & {
     lastArray?: LastArrayItem[];
     isChildSubject?: boolean;
 };
-export declare function processTagArray(subject: TagArraySubject, value: Tag[], // arry of Tag classes
+export declare function processTagArray(subject: TagArraySubject, value: (TemplaterResult | Tag)[], // arry of Tag classes
 insertBefore: InsertBefore, // <template end interpolate />
-ownerTag: Tag, options: {
+ownerSupport: TagSupport, options: {
     counts: Counts;
     forceElement?: boolean;
 }): Clones;

package/js/processTagArray.js

@@ -1,11 +1,13 @@
 import { ValueSubject } from './subject/ValueSubject';
 import { ArrayNoKeyError } from './errors';
 import { destroyArrayTag } from './checkDestroyPrevious.function';
-import { applyFakeTemplater } from './processTag.function';
+import { setupNewTemplater, tagFakeTemplater } from './processTag.function';
+import { TagSupport } from './TagSupport.class';
+import { isTagClass } from './isInstance';
 export function processTagArray(subject, value, // arry of Tag classes
 insertBefore, // <template end interpolate />
-ownerTag, options) {
-    const clones = ownerTag.clones; // []
+ownerSupport, options) {
+    const clones = ownerSupport.clones; // []
     let lastArray = subject.lastArray = subject.lastArray || [];
     if (!subject.placeholder) {
         setPlaceholderElm(insertBefore, subject);
@@ -17,14 +19,17 @@ ownerTag, options) {
         const newLength = value.length - 1;
         const at = index - removed;
         const lessLength = newLength < at;
-        const subTag = value[index - removed];
-        const subArrayValue = subTag?.memory.arrayValue;
-        const tag = item.tag;
-        const destroyItem = lessLength || !areLikeValues(subArrayValue, tag.memory.arrayValue);
+        const subValue = value[index - removed];
+        const subTag = subValue;
+        // const tag = subTag?.templater.tag as Tag
+        const lastTag = item.tagSupport.templater.tag;
+        const newArrayValue = subTag?.memory.arrayValue;
+        const lastArrayValue = lastTag.memory.arrayValue;
+        const destroyItem = lessLength || !areLikeValues(newArrayValue, lastArrayValue);
         if (destroyItem) {
             const last = lastArray[index];
-            const tag = last.tag;
-            destroyArrayTag(tag, options.counts);
+            const tagSupport = last.tagSupport;
+            destroyArrayTag(tagSupport, options.counts);
             last.deleted = true;
             ++removed;
             ++options.counts.removed;
@@ -32,22 +37,28 @@ ownerTag, options) {
         }
         return true;
     });
-    value.forEach((subTag, index) => {
+    value.forEach((item, index) => {
         const previous = lastArray[index];
-        const previousSupport = previous?.tag.tagSupport;
-        const fakeSubject = new ValueSubject({});
-        applyFakeTemplater(subTag, ownerTag, fakeSubject);
+        const previousSupport = previous?.tagSupport;
+        const subTag = item;
+        if (isTagClass(subTag) && !subTag.templater) {
+            tagFakeTemplater(subTag);
+        }
+        const tagSupport = new TagSupport(subTag.templater, ownerSupport, new ValueSubject(undefined));
+        // tagSupport.templater = subTag.templater
         if (previousSupport) {
-            subTag.tagSupport.templater.global = previousSupport.templater.global;
-            previousSupport.templater.global.newest = subTag;
+            setupNewTemplater(tagSupport, ownerSupport, previousSupport.subject);
+            const global = previousSupport.global;
+            tagSupport.global = global;
+            global.newest = tagSupport;
         }
         // check for html``.key()
         const keySet = 'arrayValue' in subTag.memory;
         if (!keySet) {
             const details = {
-                template: subTag.getTemplate().string,
+                template: tagSupport.getTemplate().string,
                 array: value,
-                ownerTagContent: ownerTag.lastTemplateString,
+                ownerTagContent: ownerSupport.lastTemplateString,
             };
             const message = 'Use html`...`.key(item) instead of html`...` to template an Array';
             console.error(message, details);
@@ -56,22 +67,15 @@ ownerTag, options) {
         }
         const couldBeSame = lastArray.length > index;
         if (couldBeSame) {
-            const prevSupport = previous.tag.tagSupport;
-            const prevGlobal = prevSupport.templater.global;
-            const isSame = areLikeValues(previous.tag.memory.arrayValue, subTag.memory.arrayValue);
-            if (isSame) {
-                subTag.tagSupport = subTag.tagSupport || prevSupport;
-                const oldest = prevGlobal.oldest;
-                oldest.updateByTag(subTag);
-                return [];
-            }
-            // TODO: should not get here?
-            processAddTagArrayItem(runtimeInsertBefore, subTag, index, options, lastArray);
-            throw new Error('item should be back');
-            // return [] // removed: item should have been previously deleted and will be added back
+            const prevSupport = previous.tagSupport;
+            const prevGlobal = prevSupport.global;
+            // subTag.tagSupport = subTag.tagSupport || prevSupport
+            const oldest = prevGlobal.oldest;
+            oldest.updateBy(tagSupport);
+            return [];
         }
-        processAddTagArrayItem(runtimeInsertBefore, subTag, index, options, lastArray);
-        ownerTag.childTags.push(subTag);
+        processAddTagArrayItem(runtimeInsertBefore, tagSupport, index, options, lastArray);
+        ownerSupport.childTags.push(tagSupport);
     });
     return clones;
 }
@@ -85,9 +89,9 @@ function setPlaceholderElm(insertBefore, subject) {
     parentNode.insertBefore(placeholder, insertBefore);
     parentNode.removeChild(insertBefore);
 }
-function processAddTagArrayItem(before, subTag, index, options, lastArray) {
+function processAddTagArrayItem(before, tagSupport, index, options, lastArray) {
     const lastValue = {
-        tag: subTag, index
+        tagSupport, index
     };
     // Added to previous array
     lastArray.push(lastValue);
@@ -95,12 +99,10 @@ function processAddTagArrayItem(before, subTag, index, options, lastArray) {
         added: options.counts.added + index,
         removed: options.counts.removed,
     };
-    if (!before.parentNode) {
-        throw new Error('issue adding array item');
-    }
     const newTempElm = document.createElement('template');
-    before.parentNode.insertBefore(newTempElm, before);
-    subTag.buildBeforeElement(newTempElm, // before,
+    const parent = before.parentNode;
+    parent.insertBefore(newTempElm, before);
+    tagSupport.buildBeforeElement(newTempElm, // before,
     { counts, forceElement: options.forceElement });
 }
 /** compare two values. If both values are arrays then the items will be compared */

package/js/processTagArray.js.map

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

package/js/processTagResult.function.d.ts

@@ -1,9 +1,9 @@
-import { Tag } from './Tag.class';
-import { Counts } from './interpolateTemplate';
+import { Counts } from './interpolations/interpolateTemplate';
 import { TagArraySubject } from './processTagArray';
-import { TagSubject } from './Tag.utils';
+import { TagSubject } from './subject.types';
 import { InsertBefore } from './Clones.type';
-export declare function processTagResult(tag: Tag, subject: TagArraySubject | TagSubject | Function, // used for recording past and current value
+import { TagSupport } from './TagSupport.class';
+export declare function processTagResult(tagSupport: TagSupport, subject: TagArraySubject | TagSubject | Function, // used for recording past and current value
 insertBefore: InsertBefore, // <template end interpolate />
 { counts, forceElement, }: {
     counts: Counts;

package/js/processTagResult.function.js

@@ -1,46 +1,30 @@
-export function processTagResult(tag, subject, // used for recording past and current value
+export function processTagResult(tagSupport, subject, // used for recording past and current value
 insertBefore, // <template end interpolate />
 { counts, forceElement, }) {
-    if (!insertBefore.parentNode) {
-        throw new Error(`before here processTagResult ${insertBefore.nodeName}`);
-    }
     // *if appears we already have seen
     const subjectTag = subject;
-    const existingTag = subjectTag.tag;
-    const previousTag = existingTag?.tagSupport.templater.global.oldest || undefined; // || tag.tagSupport.oldest // subjectTag.tag
-    const justUpdate = previousTag; // && !forceElement
-    if (previousTag && justUpdate) {
-        /*
-        const areLike = previousTag.isLikeTag(tag)
-    
-        // are we just updating an if we already had?
-        if(areLike) {
-          return processTagResultUpdate(tag, subjectTag, previousTag)
-        }
-        */
-        return processTagResultUpdate(tag, subjectTag, previousTag);
-    }
-    /*
-    if(insertBefore.nodeName !== 'TEMPLATE') {
-      throw new Error(`processTagResult.function.ts insertBefore is not template ${insertBefore.nodeName}`)
+    const lastSupport = subjectTag.tagSupport;
+    const prevSupport = lastSupport?.global.oldest || undefined; // || tag.tagSupport.oldest // subjectTag.tag
+    const justUpdate = prevSupport; // && !forceElement
+    if (prevSupport && justUpdate) {
+        return processTagResultUpdate(tagSupport, subjectTag, prevSupport);
     }
-    */
-    tag.buildBeforeElement(insertBefore, {
+    tagSupport.buildBeforeElement(insertBefore, {
         counts,
         forceElement,
     });
 }
-function processTagResultUpdate(tag, subject, // used for recording past and current value
-previousTag) {
+function processTagResultUpdate(tagSupport, subject, // used for recording past and current value
+prevSupport) {
     // components
     if (subject instanceof Function) {
-        const newTag = subject(previousTag.tagSupport);
-        previousTag.updateByTag(newTag);
-        subject.tag = newTag;
+        const newSupport = subject(prevSupport);
+        prevSupport.updateBy(newSupport);
+        subject.tagSupport = newSupport;
         return;
     }
-    previousTag.updateByTag(tag);
-    subject.tag = tag;
+    prevSupport.updateBy(tagSupport);
+    subject.tagSupport = tagSupport;
     return;
 }
 //# sourceMappingURL=processTagResult.function.js.map

package/js/processTagResult.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processTagResult.function.js","sourceRoot":"","sources":["../ts/processTagResult.function.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,OAAgD,EAAE,4CAA4C;AAC9F,YAA0B,EAAE,+BAA+B;AAC3D,EACE,MAAM,EAAE,YAAY,GAIrB;IAED,IAAG,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,OAAqB,CAAA;IACxC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAA;IAClC,MAAM,WAAW,GAAG,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,MAAa,IAAI,SAAS,CAAA,CAAC,6CAA6C;IACrI,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,mBAAmB;IAElD,IAAG,WAAW,IAAI,UAAU,EAAE,CAAC;QAC7B;;;;;;;UAOE;QACF,OAAO,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IAC7D,CAAC;IAGD;;;;MAIE;IAEF,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QACnC,MAAM;QACN,YAAY;KACb,CAAC,CAAA;AACJ,CAAC;AAGD,SAAS,sBAAsB,CAC7B,GAAQ,EACR,OAAmB,EAAE,4CAA4C;AACjE,WAAgB;IAEhB,aAAa;IACb,IAAG,OAAO,YAAY,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAQ,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;QACnD,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,GAAG,MAAM,CAAA;QAEpB,OAAM;IACR,CAAC;IAED,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IAC5B,OAAO,CAAC,GAAG,GAAG,GAAG,CAAA;IAEjB,OAAM;AACR,CAAC"}
+{"version":3,"file":"processTagResult.function.js","sourceRoot":"","sources":["../ts/processTagResult.function.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,gBAAgB,CAC9B,UAAsB,EACtB,OAAgD,EAAE,4CAA4C;AAC9F,YAA0B,EAAE,+BAA+B;AAC3D,EACE,MAAM,EAAE,YAAY,GAIrB;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,OAAqB,CAAA;IACxC,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAA;IACzC,MAAM,WAAW,GAAG,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS,CAAA,CAAC,6CAA6C;IACzG,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,mBAAmB;IAElD,IAAG,WAAW,IAAI,UAAU,EAAE,CAAC;QAC7B,OAAO,sBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IACpE,CAAC;IAED,UAAU,CAAC,kBAAkB,CAAC,YAAY,EAAE;QAC1C,MAAM;QACN,YAAY;KACb,CAAC,CAAA;AACJ,CAAC;AAGD,SAAS,sBAAsB,CAC7B,UAAsB,EACtB,OAAqD,EAAE,4CAA4C;AACnG,WAAuB;IAEvB,aAAa;IACb,IAAG,OAAO,YAAY,QAAQ,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QACvC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE/B;QAAC,OAAiC,CAAC,UAAU,GAAG,UAAU,CAAA;QAC3D,OAAM;IACR,CAAC;IAED,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAE/B,OAAM;AACR,CAAC"}