taggedjs 2.1.2 → 2.3.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +1 -1
- package/js/Clones.type.d.ts +1 -0
- package/js/Clones.type.js +2 -0
- package/js/Clones.type.js.map +1 -0
- package/js/Props.d.ts +1 -0
- package/js/Props.js +2 -0
- package/js/Props.js.map +1 -0
- package/js/Subject.d.ts +7 -2
- package/js/Subject.js +15 -10
- package/js/Subject.js.map +1 -1
- package/js/Tag.class.d.ts +37 -13
- package/js/Tag.class.js +133 -99
- package/js/Tag.class.js.map +1 -1
- package/js/Tag.utils.d.ts +8 -20
- package/js/Tag.utils.js +17 -88
- package/js/Tag.utils.js.map +1 -1
- package/js/ValueSubject.d.ts +1 -1
- package/js/ValueSubject.js.map +1 -1
- package/js/bindSubjectCallback.function.d.ts +5 -0
- package/js/bindSubjectCallback.function.js +19 -0
- package/js/bindSubjectCallback.function.js.map +1 -0
- package/js/elementDestroyCheck.function.d.ts +3 -0
- package/js/elementDestroyCheck.function.js +17 -0
- package/js/elementDestroyCheck.function.js.map +1 -0
- package/js/elementInitCheck.js.map +1 -1
- package/js/gateway/gateway.web.component.d.ts +11 -0
- package/js/gateway/gateway.web.component.js +20 -0
- package/js/gateway/gateway.web.component.js.map +1 -0
- package/js/gateway/index.d.ts +3 -0
- package/js/gateway/index.js +3 -0
- package/js/gateway/index.js.map +1 -0
- package/js/gateway/loadTagGateway.function.d.ts +2 -0
- package/js/gateway/loadTagGateway.function.js +18 -0
- package/js/gateway/loadTagGateway.function.js.map +1 -0
- package/js/gateway/tagGateway.function.d.ts +31 -0
- package/js/gateway/tagGateway.function.js +187 -0
- package/js/gateway/tagGateway.function.js.map +1 -0
- package/js/getCallback.js +39 -42
- package/js/getCallback.js.map +1 -1
- package/js/getTagSupport.d.ts +18 -17
- package/js/getTagSupport.js +104 -15
- package/js/getTagSupport.js.map +1 -1
- package/js/html.d.ts +1 -1
- package/js/html.js.map +1 -1
- package/js/index.d.ts +16 -7
- package/js/index.js +20 -8
- package/js/index.js.map +1 -1
- package/js/inputAttribute.js +3 -3
- package/js/inputAttribute.js.map +1 -1
- package/js/interpolateAttributes.d.ts +2 -1
- package/js/interpolateAttributes.js +126 -60
- package/js/interpolateAttributes.js.map +1 -1
- package/js/interpolateContentTemplates.d.ts +4 -1
- package/js/interpolateContentTemplates.js +32 -25
- package/js/interpolateContentTemplates.js.map +1 -1
- package/js/interpolateElement.d.ts +8 -13
- package/js/interpolateElement.js +26 -22
- package/js/interpolateElement.js.map +1 -1
- package/js/interpolateTemplate.d.ts +15 -19
- package/js/interpolateTemplate.js +33 -231
- package/js/interpolateTemplate.js.map +1 -1
- package/js/interpolations.d.ts +3 -2
- package/js/interpolations.js +2 -1
- package/js/interpolations.js.map +1 -1
- package/js/isInstance.d.ts +6 -0
- package/js/isInstance.js +10 -0
- package/js/isInstance.js.map +1 -0
- package/js/js/Clones.type.d.ts +1 -0
- package/js/js/Clones.type.js +2 -0
- package/js/js/Clones.type.js.map +1 -0
- package/js/js/Props.d.ts +1 -0
- package/js/js/Props.js +2 -0
- package/js/js/Props.js.map +1 -0
- package/js/js/Subject.d.ts +7 -2
- package/js/js/Subject.js +15 -10
- package/js/js/Subject.js.map +1 -1
- package/js/js/Tag.class.d.ts +27 -5
- package/js/js/Tag.class.js +109 -81
- package/js/js/Tag.class.js.map +1 -1
- package/js/js/Tag.utils.d.ts +8 -20
- package/js/js/Tag.utils.js +17 -88
- package/js/js/Tag.utils.js.map +1 -1
- package/js/js/ValueSubject.d.ts +1 -1
- package/js/js/ValueSubject.js.map +1 -1
- package/js/js/bindSubjectCallback.function.d.ts +5 -0
- package/js/js/bindSubjectCallback.function.js +19 -0
- package/js/js/bindSubjectCallback.function.js.map +1 -0
- package/js/js/elementDestroyCheck.function.d.ts +3 -0
- package/js/js/elementDestroyCheck.function.js +17 -0
- package/js/js/elementDestroyCheck.function.js.map +1 -0
- package/js/js/elementInitCheck.js.map +1 -1
- package/js/js/getCallback.js +39 -42
- package/js/js/getCallback.js.map +1 -1
- package/js/js/getTagSupport.d.ts +19 -17
- package/js/js/getTagSupport.js +111 -15
- package/js/js/getTagSupport.js.map +1 -1
- package/js/js/html.d.ts +1 -1
- package/js/js/html.js.map +1 -1
- package/js/js/index.d.ts +16 -7
- package/js/js/index.js +20 -8
- package/js/js/index.js.map +1 -1
- package/js/js/interpolateAttributes.d.ts +2 -1
- package/js/js/interpolateAttributes.js +118 -60
- package/js/js/interpolateAttributes.js.map +1 -1
- package/js/js/interpolateContentTemplates.d.ts +3 -1
- package/js/js/interpolateContentTemplates.js +32 -22
- package/js/js/interpolateContentTemplates.js.map +1 -1
- package/js/js/interpolateElement.d.ts +7 -12
- package/js/js/interpolateElement.js +18 -21
- package/js/js/interpolateElement.js.map +1 -1
- package/js/js/interpolateTemplate.d.ts +15 -19
- package/js/js/interpolateTemplate.js +33 -231
- package/js/js/interpolateTemplate.js.map +1 -1
- package/js/js/interpolations.d.ts +3 -1
- package/js/js/interpolations.js +3 -3
- package/js/js/interpolations.js.map +1 -1
- package/js/js/isInstance.d.ts +6 -0
- package/js/js/isInstance.js +10 -0
- package/js/js/isInstance.js.map +1 -0
- package/js/js/onDestroy.d.ts +2 -0
- package/js/js/onDestroy.js +20 -0
- package/js/js/onDestroy.js.map +1 -0
- package/js/js/onInit.d.ts +0 -4
- package/js/js/onInit.js +12 -10
- package/js/js/onInit.js.map +1 -1
- package/js/js/processSubjectComponent.function.d.ts +8 -0
- package/js/js/processSubjectComponent.function.js +53 -0
- package/js/js/processSubjectComponent.function.js.map +1 -0
- package/js/js/processSubjectValue.function.d.ts +16 -0
- package/js/js/processSubjectValue.function.js +122 -0
- package/js/js/processSubjectValue.function.js.map +1 -0
- package/js/js/processTagArray.d.ts +5 -1
- package/js/js/processTagArray.js +21 -10
- package/js/js/processTagArray.js.map +1 -1
- package/js/js/processTagResult.function.d.ts +10 -0
- package/js/js/processTagResult.function.js +42 -0
- package/js/js/processTagResult.function.js.map +1 -0
- package/js/js/providers.d.ts +4 -12
- package/js/js/providers.js +28 -20
- package/js/js/providers.js.map +1 -1
- package/js/js/redrawTag.function.d.ts +7 -0
- package/js/js/redrawTag.function.js +9 -0
- package/js/js/redrawTag.function.js.map +1 -0
- package/js/js/render.d.ts +1 -6
- package/js/js/render.js +8 -15
- package/js/js/render.js.map +1 -1
- package/js/js/renderAppToElement.d.ts +8 -2
- package/js/js/renderAppToElement.js +40 -21
- package/js/js/renderAppToElement.js.map +1 -1
- package/js/js/setUse.function.d.ts +23 -0
- package/js/js/setUse.function.js +14 -0
- package/js/js/setUse.function.js.map +1 -0
- package/js/js/state.d.ts +14 -11
- package/js/js/state.js +68 -33
- package/js/js/state.js.map +1 -1
- package/js/js/tag.d.ts +7 -16
- package/js/js/tag.js +33 -44
- package/js/js/tag.js.map +1 -1
- package/js/js/tagElement.d.ts +14 -0
- package/js/js/tagElement.js +57 -0
- package/js/js/tagElement.js.map +1 -0
- package/js/js/tagGateway.function.d.ts +5 -0
- package/js/js/tagGateway.function.js +119 -0
- package/js/js/tagGateway.function.js.map +1 -0
- package/js/js/tagRunner.d.ts +2 -13
- package/js/js/tagRunner.js +12 -12
- package/js/js/tagRunner.js.map +1 -1
- package/js/js/templater.utils.d.ts +28 -0
- package/js/js/templater.utils.js +99 -0
- package/js/js/templater.utils.js.map +1 -0
- package/js/js/updateTag.utils.d.ts +6 -0
- package/js/js/updateTag.utils.js +84 -0
- package/js/js/updateTag.utils.js.map +1 -0
- package/js/onDestroy.d.ts +2 -0
- package/js/onDestroy.js +20 -0
- package/js/onDestroy.js.map +1 -0
- package/js/onInit.d.ts +0 -4
- package/js/onInit.js +12 -10
- package/js/onInit.js.map +1 -1
- package/js/processSubjectComponent.function.d.ts +8 -0
- package/js/processSubjectComponent.function.js +53 -0
- package/js/processSubjectComponent.function.js.map +1 -0
- package/js/processSubjectValue.function.d.ts +16 -0
- package/js/processSubjectValue.function.js +122 -0
- package/js/processSubjectValue.function.js.map +1 -0
- package/js/processTagArray.d.ts +5 -1
- package/js/processTagArray.js +21 -10
- package/js/processTagArray.js.map +1 -1
- package/js/processTagResult.function.d.ts +10 -0
- package/js/processTagResult.function.js +39 -0
- package/js/processTagResult.function.js.map +1 -0
- package/js/providers.d.ts +4 -12
- package/js/providers.js +28 -20
- package/js/providers.js.map +1 -1
- package/js/redrawTag.function.d.ts +7 -0
- package/js/redrawTag.function.js +8 -0
- package/js/redrawTag.function.js.map +1 -0
- package/js/render.d.ts +1 -6
- package/js/render.js +5 -19
- package/js/render.js.map +1 -1
- package/js/renderAppToElement.d.ts +8 -2
- package/js/renderAppToElement.js +40 -21
- package/js/renderAppToElement.js.map +1 -1
- package/js/setUse.function.d.ts +23 -0
- package/js/setUse.function.js +14 -0
- package/js/setUse.function.js.map +1 -0
- package/js/state.d.ts +14 -11
- package/js/state.js +68 -33
- package/js/state.js.map +1 -1
- package/js/tag.d.ts +6 -16
- package/js/tag.js +32 -43
- package/js/tag.js.map +1 -1
- package/js/tagElement.d.ts +14 -0
- package/js/tagElement.js +57 -0
- package/js/tagElement.js.map +1 -0
- package/js/tagGateway.function.d.ts +14 -0
- package/js/tagGateway.function.js +138 -0
- package/js/tagGateway.function.js.map +1 -0
- package/js/tagRunner.d.ts +2 -13
- package/js/tagRunner.js +12 -12
- package/js/tagRunner.js.map +1 -1
- package/js/templater.utils.d.ts +27 -0
- package/js/templater.utils.js +98 -0
- package/js/templater.utils.js.map +1 -0
- package/js/updateTag.utils.d.ts +6 -0
- package/js/updateTag.utils.js +102 -0
- package/js/updateTag.utils.js.map +1 -0
- package/package.json +1 -1
package/js/getCallback.js
CHANGED
|
@@ -1,53 +1,50 @@
|
|
|
1
|
+
import { setUse } from "./setUse.function.js";
|
|
1
2
|
import { getStateValue } from "./state.js";
|
|
2
|
-
import { setUse } from "./tagRunner.js";
|
|
3
3
|
export let getCallback = () => (callback) => () => {
|
|
4
4
|
throw new Error('The real callback function was called and that should never occur');
|
|
5
5
|
};
|
|
6
6
|
setUse({
|
|
7
|
-
beforeRender: (tagSupport) =>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const callbackMaker = (callback) => {
|
|
11
|
-
const trigger = () => {
|
|
12
|
-
const state = tagSupport.state;
|
|
13
|
-
const oldest = callbackMaker.state; // state.oldest as StateConfigArray
|
|
14
|
-
const newest = state.newest;
|
|
15
|
-
// ensure that the oldest has the latest values first
|
|
16
|
-
updateState(newest, oldest);
|
|
17
|
-
// run the callback
|
|
18
|
-
const promise = callback();
|
|
19
|
-
// send the oldest state changes into the newest
|
|
20
|
-
updateState(oldest, newest);
|
|
21
|
-
tagSupport.render();
|
|
22
|
-
if (promise instanceof Promise) {
|
|
23
|
-
promise.finally(() => {
|
|
24
|
-
// send the oldest state changes into the newest
|
|
25
|
-
updateState(oldest, newest);
|
|
26
|
-
tagSupport.render();
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
const state = tagSupport.state;
|
|
31
|
-
trigger.state = state;
|
|
32
|
-
return trigger;
|
|
33
|
-
};
|
|
34
|
-
const callbacks = tagSupport.callbacks;
|
|
35
|
-
callbacks.push(callbackMaker);
|
|
36
|
-
return callbackMaker;
|
|
37
|
-
};
|
|
38
|
-
},
|
|
39
|
-
afterRender: (tagSupport) => {
|
|
40
|
-
const callbacks = tagSupport.callbacks;
|
|
41
|
-
callbacks.forEach(callback => {
|
|
42
|
-
const state = tagSupport.state;
|
|
43
|
-
callback.state = [...state.newest];
|
|
44
|
-
});
|
|
45
|
-
}
|
|
7
|
+
beforeRender: (tagSupport) => initMemory(tagSupport),
|
|
8
|
+
beforeRedraw: (tagSupport) => initMemory(tagSupport),
|
|
9
|
+
// afterRender: (tagSupport: TagSupport) => {},
|
|
46
10
|
});
|
|
47
11
|
function updateState(stateFrom, stateTo) {
|
|
48
12
|
stateFrom.forEach((state, index) => {
|
|
49
|
-
const
|
|
50
|
-
const
|
|
13
|
+
const fromValue = getStateValue(state);
|
|
14
|
+
const callback = stateTo[index].callback;
|
|
15
|
+
if (callback) {
|
|
16
|
+
callback(fromValue); // set the value
|
|
17
|
+
}
|
|
18
|
+
stateTo[index].lastValue = fromValue; // record the value
|
|
51
19
|
});
|
|
52
20
|
}
|
|
21
|
+
function initMemory(tagSupport) {
|
|
22
|
+
getCallback = () => {
|
|
23
|
+
const oldState = setUse.memory.stateConfig.array;
|
|
24
|
+
const callbackMaker = (callback) => {
|
|
25
|
+
const trigger = (...args) => triggerStateUpdate(tagSupport, callback, oldState, ...args);
|
|
26
|
+
return trigger;
|
|
27
|
+
};
|
|
28
|
+
return callbackMaker;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function triggerStateUpdate(tagSupport, callback, oldState, ...args) {
|
|
32
|
+
const state = tagSupport.memory.state;
|
|
33
|
+
const newest = state.newest;
|
|
34
|
+
// ensure that the oldest has the latest values first
|
|
35
|
+
updateState(newest, oldState);
|
|
36
|
+
// run the callback
|
|
37
|
+
const promise = callback(...args);
|
|
38
|
+
// send the oldest state changes into the newest
|
|
39
|
+
updateState(oldState, newest);
|
|
40
|
+
tagSupport.render();
|
|
41
|
+
// TODO: turn back on below
|
|
42
|
+
if (promise instanceof Promise) {
|
|
43
|
+
promise.finally(() => {
|
|
44
|
+
// send the oldest state changes into the newest
|
|
45
|
+
updateState(oldState, newest);
|
|
46
|
+
tagSupport.render();
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
53
50
|
//# sourceMappingURL=getCallback.js.map
|
package/js/getCallback.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCallback.js","sourceRoot":"","sources":["../ts/getCallback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getCallback.js","sourceRoot":"","sources":["../ts/getCallback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAA2B,aAAa,EAAE,MAAM,YAAY,CAAA;AAInE,MAAM,CAAC,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,GAAS,EAAE;IAChE,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAA;AACtF,CAAC,CAAA;AAED,MAAM,CAAC;IACL,YAAY,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAChE,YAAY,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAChE,+CAA+C;CAChD,CAAC,CAAA;AAEF,SAAS,WAAW,CAClB,SAA2B,EAC3B,OAAyB;IAEzB,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACjC,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;QACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAA;QAExC,IAAG,QAAQ,EAAE,CAAC;YACZ,QAAQ,CAAE,SAAS,CAAE,CAAA,CAAC,gBAAgB;QACxC,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA,CAAC,mBAAmB;IAC1D,CAAC,CAAC,CAAA;AACJ,CAAC;AAKD,SAAS,UAAU,CAAE,UAAsB;IACzC,WAAW,GAAG,GAAG,EAAE;QACjB,MAAM,QAAQ,GAAqB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAA;QAElE,MAAM,aAAa,GAAkB,CACnC,QAAkB,EAClB,EAAE;YACF,MAAM,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAA;YAC/F,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA;QAED,OAAO,aAAa,CAAA;IACtB,CAAC,CAAA;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,UAAsB,EACtB,QAAkB,EAClB,QAA0B,EAC1B,GAAG,IAAW;IAEd,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAc,CAAA;IAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAE3B,qDAAqD;IACrD,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE7B,mBAAmB;IACnB,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;IAEjC,gDAAgD;IAChD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAE7B,UAAU,CAAC,MAAM,EAAE,CAAA;IAEnB,2BAA2B;IAC3B,IAAG,OAAO,YAAY,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;YACnB,gDAAgD;YAChD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAE7B,UAAU,CAAC,MAAM,EAAE,CAAA;QACrB,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
|
package/js/getTagSupport.d.ts
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
* @param {*} newProps value.newProps
|
|
13
|
-
* @param {*} compareToProps compareSupport.templater.props
|
|
14
|
-
* @returns {boolean}
|
|
15
|
-
*/
|
|
16
|
-
hasPropChanges: (props: any, newProps: any, compareToProps: any) => boolean;
|
|
1
|
+
import { Props } from "./Props.js";
|
|
2
|
+
import { Tag, TagMemory } from "./Tag.class.js";
|
|
3
|
+
import { TemplaterResult } from "./templater.utils.js";
|
|
4
|
+
export declare class TagSupport {
|
|
5
|
+
templater: TemplaterResult;
|
|
6
|
+
props?: unknown;
|
|
7
|
+
clonedProps: Props;
|
|
8
|
+
latestProps: Props;
|
|
9
|
+
latestClonedProps: Props;
|
|
10
|
+
memory: TagMemory;
|
|
11
|
+
constructor(templater: TemplaterResult, props?: unknown);
|
|
17
12
|
oldest?: Tag;
|
|
18
13
|
newest?: Tag;
|
|
14
|
+
hasPropChanges(props: any, // natural props
|
|
15
|
+
pastCloneProps: any, // previously cloned props
|
|
16
|
+
compareToProps: any): boolean;
|
|
17
|
+
mutatingRender(): Tag;
|
|
18
|
+
render(): Tag;
|
|
19
|
+
renderExistingTag(tag: Tag, newTemplater: TemplaterResult): boolean;
|
|
19
20
|
}
|
|
20
|
-
export declare function getTagSupport(templater?:
|
|
21
|
+
export declare function getTagSupport(templater: TemplaterResult, props?: Props): TagSupport;
|
package/js/getTagSupport.js
CHANGED
|
@@ -1,20 +1,109 @@
|
|
|
1
|
-
import { deepEqual } from "./deepFunctions.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const isEqual = isCommonEqual || deepEqual(newProps, oldProps);
|
|
15
|
-
return !isEqual;
|
|
1
|
+
import { deepClone, deepEqual } from "./deepFunctions.js";
|
|
2
|
+
import { getNewProps } from "./templater.utils.js";
|
|
3
|
+
export class TagSupport {
|
|
4
|
+
templater;
|
|
5
|
+
props;
|
|
6
|
+
// props from **constructor** are converted for comparing over renders
|
|
7
|
+
clonedProps;
|
|
8
|
+
latestProps; // new props NOT cloned props
|
|
9
|
+
latestClonedProps;
|
|
10
|
+
memory = {
|
|
11
|
+
context: {}, // populated after reading interpolated.values array converted to an object {variable0, variable:1}
|
|
12
|
+
state: {
|
|
13
|
+
newest: [],
|
|
16
14
|
},
|
|
15
|
+
providers: [],
|
|
16
|
+
/** Indicator of re-rending. Saves from double rending something already rendered */
|
|
17
|
+
renderCount: 0,
|
|
17
18
|
};
|
|
19
|
+
constructor(templater, props) {
|
|
20
|
+
this.templater = templater;
|
|
21
|
+
this.props = props;
|
|
22
|
+
this.latestProps = props; // getNewProps(props, templater)
|
|
23
|
+
const latestProps = getNewProps(props, templater);
|
|
24
|
+
this.latestClonedProps = deepClone(latestProps);
|
|
25
|
+
this.clonedProps = this.latestClonedProps;
|
|
26
|
+
}
|
|
27
|
+
// TODO: these below may not be in use
|
|
28
|
+
oldest;
|
|
29
|
+
newest;
|
|
30
|
+
hasPropChanges(props, // natural props
|
|
31
|
+
pastCloneProps, // previously cloned props
|
|
32
|
+
compareToProps) {
|
|
33
|
+
const oldProps = this.props;
|
|
34
|
+
const isCommonEqual = props === undefined && props === compareToProps;
|
|
35
|
+
const isEqual = isCommonEqual || deepEqual(pastCloneProps, oldProps);
|
|
36
|
+
return !isEqual;
|
|
37
|
+
}
|
|
38
|
+
mutatingRender() {
|
|
39
|
+
const message = 'Tag function "render()" was called in sync but can only be called async';
|
|
40
|
+
console.error(message, { tagSupport: this });
|
|
41
|
+
throw new Error(message);
|
|
42
|
+
} // loaded later and only callable async
|
|
43
|
+
render() {
|
|
44
|
+
++this.memory.renderCount;
|
|
45
|
+
return this.mutatingRender();
|
|
46
|
+
} // ensure this function still works even during deconstructing
|
|
47
|
+
renderExistingTag(tag, newTemplater) {
|
|
48
|
+
const preRenderCount = this.memory.renderCount;
|
|
49
|
+
providersChangeCheck(tag);
|
|
50
|
+
// When the providers were checked, a render to myself occurred and I do not need to re-render again
|
|
51
|
+
if (preRenderCount !== this.memory.renderCount) {
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
const oldTemplater = tag.tagSupport.templater;
|
|
55
|
+
const nowProps = newTemplater.tagSupport.props; // natural props
|
|
56
|
+
const oldProps = oldTemplater?.tagSupport.props; // previously cloned props
|
|
57
|
+
const newProps = newTemplater.tagSupport.clonedProps; // new props cloned
|
|
58
|
+
return renderTag(this, nowProps, oldProps, newProps, this.templater);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
export function getTagSupport(templater, props) {
|
|
62
|
+
const tagSupport = new TagSupport(templater, props);
|
|
18
63
|
return tagSupport;
|
|
19
64
|
}
|
|
65
|
+
function providersChangeCheck(tag) {
|
|
66
|
+
const providersWithChanges = tag.tagSupport.memory.providers.filter(provider => {
|
|
67
|
+
return !deepEqual(provider.instance, provider.clone);
|
|
68
|
+
});
|
|
69
|
+
// reset clones
|
|
70
|
+
providersWithChanges.forEach(provider => {
|
|
71
|
+
const appElement = tag.getAppElement();
|
|
72
|
+
handleProviderChanges(appElement, provider);
|
|
73
|
+
provider.clone = deepClone(provider.instance);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
function handleProviderChanges(appElement, provider) {
|
|
77
|
+
const tagsWithProvider = getTagsWithProvider(appElement, provider);
|
|
78
|
+
tagsWithProvider.forEach(({ tag, renderCount, provider }) => {
|
|
79
|
+
const unRendered = renderCount === tag.tagSupport.memory.renderCount;
|
|
80
|
+
if (unRendered) {
|
|
81
|
+
provider.clone = deepClone(provider.instance);
|
|
82
|
+
tag.tagSupport.render();
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
function getTagsWithProvider(tag, provider, memory = []) {
|
|
87
|
+
const hasProvider = tag.tagSupport.memory.providers.find(xProvider => xProvider.constructMethod === provider.constructMethod);
|
|
88
|
+
if (hasProvider) {
|
|
89
|
+
memory.push({
|
|
90
|
+
tag,
|
|
91
|
+
renderCount: tag.tagSupport.memory.renderCount,
|
|
92
|
+
provider: hasProvider
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
tag.children.forEach(child => getTagsWithProvider(child, provider, memory));
|
|
96
|
+
return memory;
|
|
97
|
+
}
|
|
98
|
+
function renderTag(tagSupport, nowProps, // natural props
|
|
99
|
+
oldProps, // previously NOT cloned props
|
|
100
|
+
newProps, // now props cloned
|
|
101
|
+
templater) {
|
|
102
|
+
const hasPropsChanged = tagSupport.hasPropChanges(nowProps, newProps, oldProps);
|
|
103
|
+
tagSupport.newest = templater.redraw(); // No change detected, just redraw me only
|
|
104
|
+
if (!hasPropsChanged) {
|
|
105
|
+
return true;
|
|
106
|
+
}
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
20
109
|
//# sourceMappingURL=getTagSupport.js.map
|
package/js/getTagSupport.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTagSupport.js","sourceRoot":"","sources":["../ts/getTagSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getTagSupport.js","sourceRoot":"","sources":["../ts/getTagSupport.ts"],"names":[],"mappings":"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"}
|
package/js/html.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Tag } from "./Tag.class.js";
|
|
2
|
-
export declare function html(strings: string[], ...values: unknown[]): Tag;
|
|
2
|
+
export declare function html(strings: string[] | TemplateStringsArray, ...values: unknown[]): Tag;
|
package/js/html.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html.js","sourceRoot":"","sources":["../ts/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,MAAM,UAAU,IAAI,CAClB,
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../ts/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,MAAM,UAAU,IAAI,CAClB,OAAwC,EACxC,GAAG,MAAiB;IAEpB,OAAO,IAAI,GAAG,CAAC,OAAmB,EAAE,MAAM,CAAC,CAAA;AAC7C,CAAC"}
|
package/js/index.d.ts
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
1
|
+
/** Must use .js and NOT .ts extensions here */
|
|
2
|
+
export * from "./html.js";
|
|
3
|
+
export * from "./Subject.js";
|
|
4
|
+
export * from "./interpolateElement.js";
|
|
5
|
+
export * from "./getTagSupport.js";
|
|
6
|
+
export * from "./redrawTag.function.js";
|
|
7
|
+
export * from "./gateway/index.js";
|
|
8
|
+
export { isTagComponent } from "./isInstance.js";
|
|
9
|
+
export { tags, tag } from "./tag.js";
|
|
10
|
+
export { TagComponent } from "./templater.utils.js";
|
|
11
|
+
export { tagElement } from "./tagElement.js";
|
|
6
12
|
export { Tag } from "./Tag.class.js";
|
|
7
|
-
export
|
|
13
|
+
export { runBeforeRender } from "./tagRunner.js";
|
|
14
|
+
export { setUse } from "./setUse.function.js";
|
|
8
15
|
export { providers } from "./providers.js";
|
|
9
16
|
export { state } from "./state.js";
|
|
10
|
-
export
|
|
17
|
+
export * from "./onInit.js";
|
|
18
|
+
export * from "./onDestroy.js";
|
|
19
|
+
export * from "./getCallback.js";
|
package/js/index.js
CHANGED
|
@@ -1,12 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
1
|
+
/** Must use .js and NOT .ts extensions here */
|
|
2
|
+
export * from "./html.js";
|
|
3
|
+
export * from "./Subject.js";
|
|
4
|
+
export * from "./interpolateElement.js";
|
|
5
|
+
export * from "./getTagSupport.js";
|
|
6
|
+
export * from "./redrawTag.function.js";
|
|
7
|
+
export * from "./gateway/index.js";
|
|
8
|
+
// TODO: export *
|
|
9
|
+
export { isTagComponent } from "./isInstance.js";
|
|
10
|
+
export { tags, tag } from "./tag.js";
|
|
11
|
+
export { tagElement } from "./tagElement.js";
|
|
6
12
|
export { Tag } from "./Tag.class.js";
|
|
7
|
-
|
|
8
|
-
export
|
|
13
|
+
export { runBeforeRender } from "./tagRunner.js";
|
|
14
|
+
export { setUse } from "./setUse.function.js";
|
|
15
|
+
/* hooks */
|
|
16
|
+
// TODO: export *
|
|
9
17
|
export { providers } from "./providers.js";
|
|
18
|
+
// TODO: export *
|
|
10
19
|
export { state } from "./state.js";
|
|
11
|
-
export
|
|
20
|
+
export * from "./onInit.js";
|
|
21
|
+
export * from "./onDestroy.js";
|
|
22
|
+
export * from "./getCallback.js";
|
|
23
|
+
/* end: hooks */
|
|
12
24
|
//# sourceMappingURL=index.js.map
|
package/js/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAElC,iBAAiB;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAEpC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,WAAW;AACT,iBAAiB;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,iBAAiB;AACjB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAClC,gBAAgB"}
|
package/js/inputAttribute.js
CHANGED
|
@@ -6,12 +6,12 @@ export function inputAttribute(name, value, element) {
|
|
|
6
6
|
}
|
|
7
7
|
// Example: class.width-full = "true"
|
|
8
8
|
if (names[0] === 'class') {
|
|
9
|
-
names.
|
|
9
|
+
names.shift();
|
|
10
10
|
if (value) {
|
|
11
|
-
names.forEach(name => element.classList.
|
|
11
|
+
names.forEach(name => element.classList.add(name));
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
names.forEach(name => element.classList.
|
|
14
|
+
names.forEach(name => element.classList.remove(name));
|
|
15
15
|
}
|
|
16
16
|
return;
|
|
17
17
|
}
|
package/js/inputAttribute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inputAttribute.js","sourceRoot":"","sources":["../ts/inputAttribute.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,KAAU,EACV,OAAgB;IAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE7B,8BAA8B;IAC9B,IAAG,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QACvB,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;IAC1C,CAAC;IAED,qCAAqC;IACrC,IAAG,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"inputAttribute.js","sourceRoot":"","sources":["../ts/inputAttribute.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,KAAU,EACV,OAAgB;IAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE7B,8BAA8B;IAC9B,IAAG,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QACvB,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;IAC1C,CAAC;IAED,qCAAqC;IACrC,IAAG,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,IAAG,KAAK,EAAE,CAAC;YACT,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QACpD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QACvD,CAAC;QACD,OAAM;IACR,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Context, Tag } from "./Tag.class.js";
|
|
2
2
|
export declare function interpolateAttributes(child: Element, scope: Context, ownerTag: Tag): void;
|
|
3
|
-
|
|
3
|
+
/** Looking for (class | style) followed by a period */
|
|
4
|
+
export declare function isSpecialAttr(attrName: string | String): boolean;
|
|
@@ -1,69 +1,135 @@
|
|
|
1
|
-
import { Subject } from "./Subject.js";
|
|
2
1
|
import { inputAttribute } from "./inputAttribute.js";
|
|
3
|
-
|
|
4
|
-
const endRegX = /}\s*$/;
|
|
2
|
+
import { isSubjectInstance } from "./isInstance.js";
|
|
5
3
|
export function interpolateAttributes(child, scope, ownerTag) {
|
|
6
|
-
child.getAttributeNames()
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
child[attrName] = function (...args) {
|
|
18
|
-
result(child, args);
|
|
19
|
-
};
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
if (result instanceof Subject) {
|
|
23
|
-
child.removeAttribute(attrName);
|
|
24
|
-
const callback = (newAttrValue) => {
|
|
25
|
-
if (newAttrValue instanceof Function) {
|
|
26
|
-
;
|
|
27
|
-
child[attrName] = function (...args) {
|
|
28
|
-
newAttrValue(child, args);
|
|
29
|
-
};
|
|
30
|
-
child[attrName].tagFunction = newAttrValue;
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
if (isSpecial) {
|
|
34
|
-
inputAttribute(attrName, newAttrValue, child);
|
|
35
|
-
}
|
|
36
|
-
if (newAttrValue) {
|
|
37
|
-
child.setAttribute(attrName, newAttrValue);
|
|
38
|
-
}
|
|
39
|
-
const isDeadValue = newAttrValue === undefined || newAttrValue === false || newAttrValue === null;
|
|
40
|
-
if (isDeadValue) {
|
|
41
|
-
child.removeAttribute(attrName);
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
|
-
// value is 0
|
|
45
|
-
child.setAttribute(attrName, newAttrValue);
|
|
46
|
-
};
|
|
47
|
-
const sub = result.subscribe(callback);
|
|
48
|
-
ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
// child.setAttribute(attrName, result)
|
|
52
|
-
/*
|
|
53
|
-
if(attrName === 'style') {
|
|
54
|
-
return
|
|
55
|
-
}
|
|
56
|
-
*/
|
|
57
|
-
child.setAttribute(attrName, result.value);
|
|
58
|
-
return;
|
|
59
|
-
}
|
|
60
|
-
// Non dynamic
|
|
61
|
-
if (isSpecial) {
|
|
62
|
-
return inputAttribute(attrName, value, child);
|
|
4
|
+
const attrNames = child.getAttributeNames();
|
|
5
|
+
const isTextArea = child.nodeName === 'TEXTAREA';
|
|
6
|
+
if (isTextArea && !attrNames.includes('value')) {
|
|
7
|
+
const value = child.getAttribute('textVarValue'); // (child as any).value
|
|
8
|
+
processAttribute('textVarValue', value, child, scope, ownerTag, (_name, value) => child.value = value);
|
|
9
|
+
}
|
|
10
|
+
const howToSet = (name, value) => {
|
|
11
|
+
/*
|
|
12
|
+
if(name === 'class'){
|
|
13
|
+
value.split(' ').forEach(className => child.classList.add(className))
|
|
14
|
+
return
|
|
63
15
|
}
|
|
16
|
+
*/
|
|
17
|
+
child.setAttribute(name, value);
|
|
18
|
+
};
|
|
19
|
+
attrNames.forEach(attrName => {
|
|
20
|
+
const value = child.getAttribute(attrName);
|
|
21
|
+
processAttribute(attrName, value, child, scope, ownerTag, howToSet);
|
|
64
22
|
});
|
|
65
23
|
}
|
|
24
|
+
/** Looking for (class | style) followed by a period */
|
|
66
25
|
export function isSpecialAttr(attrName) {
|
|
67
26
|
return attrName.search(/^(class|style)(\.)/) >= 0;
|
|
68
27
|
}
|
|
28
|
+
function processAttribute(attrName, value, child, scope, ownerTag, howToSet) {
|
|
29
|
+
if (isTagVar(value)) {
|
|
30
|
+
return processScopedNameValueAttr(attrName, value, child, scope, ownerTag, howToSet);
|
|
31
|
+
}
|
|
32
|
+
if (isTagVar(attrName)) {
|
|
33
|
+
const contextValueSubject = getContextValueByVarString(scope, attrName);
|
|
34
|
+
let lastValue;
|
|
35
|
+
// the above callback gets called immediately since its a ValueSubject()
|
|
36
|
+
const sub = contextValueSubject.subscribe((value) => {
|
|
37
|
+
processNameOnlyAttr(value, lastValue, child, ownerTag, howToSet);
|
|
38
|
+
lastValue = value;
|
|
39
|
+
});
|
|
40
|
+
ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
|
|
41
|
+
child.removeAttribute(attrName);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
// Non dynamic
|
|
45
|
+
const isSpecial = isSpecialAttr(attrName);
|
|
46
|
+
if (isSpecial) {
|
|
47
|
+
return inputAttribute(attrName, value, child);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const startRegX = /^\s*{__tagvar/;
|
|
51
|
+
const endRegX = /}\s*$/;
|
|
52
|
+
function isTagVar(value) {
|
|
53
|
+
return value && value.search(startRegX) >= 0 && value.search(endRegX) >= 0;
|
|
54
|
+
}
|
|
55
|
+
function processNameOnlyAttr(attrValue, lastValue, child, ownerTag, howToSet) {
|
|
56
|
+
if (lastValue && lastValue != attrValue) {
|
|
57
|
+
if (typeof (lastValue) === 'string') {
|
|
58
|
+
child.removeAttribute(lastValue);
|
|
59
|
+
}
|
|
60
|
+
else if (lastValue instanceof Object) {
|
|
61
|
+
Object.entries(lastValue).forEach(([name]) => child.removeAttribute(name));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
if (typeof (attrValue) === 'string') {
|
|
65
|
+
if (!attrValue.length) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
processNameValueAttr(attrValue, '', child, ownerTag, howToSet);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
if (attrValue instanceof Object) {
|
|
72
|
+
Object.entries(attrValue).forEach(([name, value]) => processNameValueAttr(name, value, child, ownerTag, howToSet));
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
function getContextValueByVarString(scope, value) {
|
|
77
|
+
const code = value.replace('{', '').split('').reverse().join('').replace('}', '').split('').reverse().join('');
|
|
78
|
+
return scope[code];
|
|
79
|
+
}
|
|
80
|
+
function processNameValueAttr(attrName, result, child, ownerTag, howToSet) {
|
|
81
|
+
const isSpecial = isSpecialAttr(attrName);
|
|
82
|
+
// attach as callback
|
|
83
|
+
if (result instanceof Function) {
|
|
84
|
+
const action = function (...args) {
|
|
85
|
+
return result(child, args);
|
|
86
|
+
};
|
|
87
|
+
child[attrName].action = action;
|
|
88
|
+
// child.addEventListener(attrName, action)
|
|
89
|
+
}
|
|
90
|
+
if (isSubjectInstance(result)) {
|
|
91
|
+
child.removeAttribute(attrName);
|
|
92
|
+
const callback = (newAttrValue) => processSubjectValue(newAttrValue, child, attrName, isSpecial, howToSet);
|
|
93
|
+
// the above callback gets called immediately since its a ValueSubject()
|
|
94
|
+
const sub = result.subscribe(callback);
|
|
95
|
+
ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
howToSet(attrName, result);
|
|
99
|
+
// child.setAttribute(attrName, result.value)
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
function processSubjectValue(newAttrValue, child, attrName, isSpecial, howToSet) {
|
|
103
|
+
if (newAttrValue instanceof Function) {
|
|
104
|
+
;
|
|
105
|
+
child[attrName] = function (...args) {
|
|
106
|
+
return newAttrValue(child, args);
|
|
107
|
+
};
|
|
108
|
+
child[attrName].tagFunction = newAttrValue;
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (isSpecial) {
|
|
112
|
+
inputAttribute(attrName, newAttrValue, child);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
if (newAttrValue) {
|
|
116
|
+
howToSet(attrName, newAttrValue);
|
|
117
|
+
// child.setAttribute(attrName, newAttrValue)
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const isDeadValue = newAttrValue === undefined || newAttrValue === false || newAttrValue === null;
|
|
121
|
+
if (isDeadValue) {
|
|
122
|
+
child.removeAttribute(attrName);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
// value is 0
|
|
126
|
+
howToSet(attrName, newAttrValue);
|
|
127
|
+
// child.setAttribute(attrName, newAttrValue)
|
|
128
|
+
}
|
|
129
|
+
function processScopedNameValueAttr(attrName, value, // {__tagVarN}
|
|
130
|
+
child, scope, ownerTag, howToSet) {
|
|
131
|
+
// get the code inside the brackets like "variable0" or "{variable0}"
|
|
132
|
+
const result = getContextValueByVarString(scope, value);
|
|
133
|
+
return processNameValueAttr(attrName, result, child, ownerTag, howToSet);
|
|
134
|
+
}
|
|
69
135
|
//# sourceMappingURL=interpolateAttributes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../ts/interpolateAttributes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../ts/interpolateAttributes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { Clones } from "./Clones.type.js";
|
|
1
2
|
import { Tag } from "./Tag.class.js";
|
|
3
|
+
import { InterpolateOptions } from "./interpolateElement.js";
|
|
2
4
|
/** Returns subscriptions[] that will need to be unsubscribed from when element is destroyed */
|
|
3
|
-
export declare function interpolateContentTemplates(element: Element,
|
|
5
|
+
export declare function interpolateContentTemplates(element: Element, // <div><div></div><template tag-wrap="22">...</template></div>
|
|
6
|
+
variable: any, tag: Tag, options: InterpolateOptions, children: HTMLCollection): Clones;
|