Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f8bb86820e | |||
| 0cde4b8737 | |||
| 66a801393f | |||
| e7f405cc97 | |||
| 55c48b2b12 | |||
| 2eb151c92d | |||
| 7952f31e63 | |||
| 11e4e67599 | |||
| 7b7a6de373 | |||
| b63d1e28b2 | |||
| c0667a11c6 | |||
| fddb1ec924 | |||
| e6c3b62ef0 | |||
| 97b69f164f | |||
| 33dfeb1b41 | |||
| dd292472b9 | |||
| 9b18b57fdf | |||
| 68f491cd32 | |||
| 7b3e39ba27 | |||
| 61fc3f4fdc | |||
| 7b454dae66 | |||
| 70101e4c66 | |||
| 5ef405293a | |||
| 9dcbbe54eb | |||
| e94428a186 | |||
| 941190dfa8 | |||
| a53e42518f | |||
| b7c37ca69a | |||
| 34489a2494 | |||
| 398df543fe | |||
| aa6a4a5d46 | |||
| db3499f5e5 | |||
| 166cada8ff | |||
| acbe316689 | |||
| fb013ccc72 | |||
| fee3eecd7f | |||
| 6037018dd2 | |||
| eec7cc4ea7 | |||
| 035895b043 | |||
| ff5ef82ea2 | |||
| 0048205636 | |||
| 0d341d9e7b | |||
| 4c7f572dbe | |||
| 610c272104 | |||
| 32e4565131 | |||
| 9b9c15e4a9 |
@@ -15,7 +15,7 @@ yarn-debug.log*
|
|||||||
yarn-error.log*
|
yarn-error.log*
|
||||||
|
|
||||||
#ide's
|
#ide's
|
||||||
.vscode
|
**/.vscode/*
|
||||||
.idea
|
.idea
|
||||||
|
|
||||||
node_modules
|
node_modules
|
||||||
@@ -26,3 +26,10 @@ release-notes.md
|
|||||||
|
|
||||||
# useful in some cases
|
# useful in some cases
|
||||||
/temp
|
/temp
|
||||||
|
|
||||||
|
# owl-vision
|
||||||
|
*/owl-vision/out/
|
||||||
|
*/owl-vision/.vs/
|
||||||
|
**/*.vsix
|
||||||
|
!*/owl-vision/.vscode/launch.json
|
||||||
|
!*/owl-vision/.vscode/tasks.json
|
||||||
|
|||||||
@@ -47,3 +47,4 @@ Utility/helpers:
|
|||||||
- [`status`](reference/component.md#status-helper): utility function to get the status of a component (new, mounted or destroyed)
|
- [`status`](reference/component.md#status-helper): utility function to get the status of a component (new, mounted or destroyed)
|
||||||
- [`validate`](reference/utils.md#validate): validates if an object satisfies a specified schema
|
- [`validate`](reference/utils.md#validate): validates if an object satisfies a specified schema
|
||||||
- [`whenReady`](reference/utils.md#whenready): utility function to execute code when DOM is ready
|
- [`whenReady`](reference/utils.md#whenready): utility function to execute code when DOM is ready
|
||||||
|
- [`batched`](reference/utils.md#batched): utility function to batch function calls
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ The `config` object is an object with some of the following keys:
|
|||||||
templates (see [translations](translations.md))
|
templates (see [translations](translations.md))
|
||||||
- **`templates (string | xml document)`**: all the templates that will be used by
|
- **`templates (string | xml document)`**: all the templates that will be used by
|
||||||
the components created by the application.
|
the components created by the application.
|
||||||
|
- **`getTemplate ((s: string) => Element | Function | string | void)`**: a function that will be called by owl when it
|
||||||
|
needs a template. If undefined is returned, owl looks into the app templates.
|
||||||
- **`warnIfNoStaticProps (boolean, default=false)`**: if true, Owl will log a warning
|
- **`warnIfNoStaticProps (boolean, default=false)`**: if true, Owl will log a warning
|
||||||
whenever it encounters a component that does not provide a [static props description](props.md#props-validation).
|
whenever it encounters a component that does not provide a [static props description](props.md#props-validation).
|
||||||
|
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ cleaning operation, since the component may be destroyed before it has even been
|
|||||||
mounted. The `willDestroy` hook is useful in that situation, since it is always
|
mounted. The `willDestroy` hook is useful in that situation, since it is always
|
||||||
called.
|
called.
|
||||||
|
|
||||||
The `onWillUnmount` hook is used to register a function that will be executed at
|
The `onWillDestroy` hook is used to register a function that will be executed at
|
||||||
this moment:
|
this moment:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ that render its content, and a fallback if an error happened.
|
|||||||
```js
|
```js
|
||||||
class ErrorBoundary extends Component {
|
class ErrorBoundary extends Component {
|
||||||
static template = xml`
|
static template = xml`
|
||||||
<t t-if="error" t-slot="fallback">An error occurred</t>
|
<t t-if="state.error" t-slot="fallback">An error occurred</t>
|
||||||
<t t-else="" t-slot="content"`;
|
<t t-else="" t-slot="default"/>`;
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
this.state = useState({ error: false });
|
this.state = useState({ error: false });
|
||||||
|
|||||||
@@ -190,12 +190,13 @@ will then be updated accordingly.
|
|||||||
### `useExternalListener`
|
### `useExternalListener`
|
||||||
|
|
||||||
The `useExternalListener` hook helps solve a very common problem: adding and removing
|
The `useExternalListener` hook helps solve a very common problem: adding and removing
|
||||||
a listener on some target whenever a component is mounted/unmounted. For example,
|
a listener on some target whenever a component is mounted/unmounted. It takes a target
|
||||||
|
as its first argument, forwards the other arguments to `addEventListener`. For example,
|
||||||
a dropdown menu (or its parent) may need to listen to a `click` event on `window`
|
a dropdown menu (or its parent) may need to listen to a `click` event on `window`
|
||||||
to be closed:
|
to be closed:
|
||||||
|
|
||||||
```js
|
```js
|
||||||
useExternalListener(window, "click", this.closeMenu);
|
useExternalListener(window, "click", this.closeMenu, { capture: true });
|
||||||
```
|
```
|
||||||
|
|
||||||
### `useComponent`
|
### `useComponent`
|
||||||
|
|||||||
@@ -140,6 +140,28 @@ class SomeComponent extends Component {
|
|||||||
The `.bind` suffix also implies `.alike`, so these props will not cause additional
|
The `.bind` suffix also implies `.alike`, so these props will not cause additional
|
||||||
renderings.
|
renderings.
|
||||||
|
|
||||||
|
## Translatable props
|
||||||
|
|
||||||
|
When you need to pass a user-facing string to a subcomponent, you likely want it
|
||||||
|
to be translated. Unfortunately, because props are arbitrary expressions, it wouldn't
|
||||||
|
be practical for Owl to find out which parts of the expression are strings and translate
|
||||||
|
them, and it also makes it difficult for tooling to extract these strings to generate
|
||||||
|
terms to translate. While you can work around this issue by doing the translation in
|
||||||
|
JavaScript, or by using `t-set` with a body (the body of `t-set` is translated),
|
||||||
|
and passing the variable as a prop, this is a sufficiently common use case that Owl
|
||||||
|
provides a suffix for this purpose: `.translate`.
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<t t-name="ParentComponent">
|
||||||
|
<Child someProp.translate="some message"/>
|
||||||
|
</t>
|
||||||
|
```
|
||||||
|
|
||||||
|
Note that the content of this attribute is _NOT_ treated as a JavaScript expression:
|
||||||
|
it is treated as a string, as if it was an attribute on an HTML element, and translated
|
||||||
|
before being passed to the component. If you need to interpolate some data into the
|
||||||
|
string, you will still have to do this in JavaScript.
|
||||||
|
|
||||||
## Dynamic Props
|
## Dynamic Props
|
||||||
|
|
||||||
The `t-props` directive can be used to specify totally dynamic props:
|
The `t-props` directive can be used to specify totally dynamic props:
|
||||||
@@ -238,7 +260,7 @@ class ComponentB extends owl.Component {
|
|||||||
count: {type: Number},
|
count: {type: Number},
|
||||||
messages: {
|
messages: {
|
||||||
type: Array,
|
type: Array,
|
||||||
element: {type: Object, shape: {id: Boolean, text: String }
|
element: {type: Object, shape: {id: Boolean, text: String }}
|
||||||
},
|
},
|
||||||
date: Date,
|
date: Date,
|
||||||
combinedVal: [Number, Boolean],
|
combinedVal: [Number, Boolean],
|
||||||
@@ -276,7 +298,8 @@ class ComponentB extends owl.Component {
|
|||||||
id: Number,
|
id: Number,
|
||||||
name: {type: String, optional: true},
|
name: {type: String, optional: true},
|
||||||
url: String
|
url: String
|
||||||
]}, // object, with keys id (number), name (string, optional) and url (string)
|
}
|
||||||
|
}, // object, with keys id (number), name (string, optional) and url (string)
|
||||||
someObj3: {
|
someObj3: {
|
||||||
type: Object,
|
type: Object,
|
||||||
values: { type: Array, element: String },
|
values: { type: Array, element: String },
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ This may seem counter-intuitive, but it makes perfect sense in the context of co
|
|||||||
```js
|
```js
|
||||||
class DoubleCounter extends Component {
|
class DoubleCounter extends Component {
|
||||||
static template = xml`
|
static template = xml`
|
||||||
<t t-esc="state.selected + ': ' + state[state.selected].value"/>
|
<t t-esc="'selected: ' + state.selected + ', value: ' + state[state.selected]"/>
|
||||||
<button t-on-click="() => this.state.count1++">increment count 1</button>
|
<button t-on-click="() => this.state.count1++">increment count 1</button>
|
||||||
<button t-on-click="() => this.state.count2++">increment count 2</button>
|
<button t-on-click="() => this.state.count2++">increment count 2</button>
|
||||||
<button t-on-click="changeCounter">Switch counter</button>
|
<button t-on-click="changeCounter">Switch counter</button>
|
||||||
@@ -193,7 +193,7 @@ to be able to opt out of creating them in the first place. This is the purpose o
|
|||||||
### `markRaw`
|
### `markRaw`
|
||||||
|
|
||||||
Marks an object so that it is ignored by the reactivity system, meaning that if this object is ever
|
Marks an object so that it is ignored by the reactivity system, meaning that if this object is ever
|
||||||
part of a of a reactive object, it will be returned as is, and no keys in that object will be
|
part of a reactive object, it will be returned as is, and no keys in that object will be
|
||||||
observed.
|
observed.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Slots can define a default content, in case the parent did not define them:
|
|||||||
## Dynamic Slots
|
## Dynamic Slots
|
||||||
|
|
||||||
The `t-slot` directive is actually able to use any expressions, using string
|
The `t-slot` directive is actually able to use any expressions, using string
|
||||||
interplolation:
|
interpolation:
|
||||||
|
|
||||||
```xml
|
```xml
|
||||||
<t t-slot="{{current}}" />
|
<t t-slot="{{current}}" />
|
||||||
@@ -201,16 +201,17 @@ use this `Notebook` component:
|
|||||||
|
|
||||||
```xml
|
```xml
|
||||||
<Notebook>
|
<Notebook>
|
||||||
<t t-set-slot="page1" title="'Page 1'">
|
<t t-set-slot="page1" title.translate="Page 1">
|
||||||
<div>this is in the page 1</div>
|
<div>this is in the page 1</div>
|
||||||
</t>
|
</t>
|
||||||
<t t-set-slot="page2" title="'Page 2'" hidden="somevalue">
|
<t t-set-slot="page2" title.translate="Page 2" hidden="somevalue">
|
||||||
<div>this is in the page 2</div>
|
<div>this is in the page 2</div>
|
||||||
</t>
|
</t>
|
||||||
</Notebook>
|
</Notebook>
|
||||||
```
|
```
|
||||||
|
|
||||||
Slot params works like normal props, so one can use the `.bind` suffix to
|
Slot params works like normal props, so one can use suffixes like `.translate`
|
||||||
|
when a prop is a user facing string and should be translated, or `.bind` to
|
||||||
bind a function if needed.
|
bind a function if needed.
|
||||||
|
|
||||||
## Slot scopes
|
## Slot scopes
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ functions are all available in the `owl.utils` namespace.
|
|||||||
- [`loadFile`](#loadfile): loading a file (useful for templates)
|
- [`loadFile`](#loadfile): loading a file (useful for templates)
|
||||||
- [`EventBus`](#eventbus): a simple EventBus
|
- [`EventBus`](#eventbus): a simple EventBus
|
||||||
- [`validate`](#validate): a validation function
|
- [`validate`](#validate): a validation function
|
||||||
|
- [`batched`](#batched): batch function calls
|
||||||
|
|
||||||
## `whenReady`
|
## `whenReady`
|
||||||
|
|
||||||
@@ -78,3 +79,22 @@ validate(
|
|||||||
// - 'id' is missing (should be a number),
|
// - 'id' is missing (should be a number),
|
||||||
// - 'url' is missing (should be a boolean or list of numbers),
|
// - 'url' is missing (should be a boolean or list of numbers),
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## `batched`
|
||||||
|
|
||||||
|
The `batched` function creates a batched version of a callback so that multiple calls to it within the same microtick will only result in a single invocation of the original callback.
|
||||||
|
|
||||||
|
```js
|
||||||
|
function hello() {
|
||||||
|
console.log("hello");
|
||||||
|
}
|
||||||
|
|
||||||
|
const batchedHello = batched(hello);
|
||||||
|
batchedHello();
|
||||||
|
// Nothing is logged
|
||||||
|
batchedHello();
|
||||||
|
// Still not logged
|
||||||
|
|
||||||
|
await Promise.resolve(); // Await the next microtick
|
||||||
|
// "hello" is logged only once
|
||||||
|
```
|
||||||
|
|||||||
@@ -35,13 +35,13 @@ The components tab is separated into two sub windows: the components tree in the
|
|||||||
the component details in the right. The components tree will display all the different
|
the component details in the right. The components tree will display all the different
|
||||||
components that are present in the tab in the form of a tree. The root of this tree is
|
components that are present in the tab in the form of a tree. The root of this tree is
|
||||||
actually the app which is not a component but can still be inspected by the devtools like
|
actually the app which is not a component but can still be inspected by the devtools like
|
||||||
one. There can also be multiple apps loaded in the page like in the following:
|
one. There can also be multiple apps loaded in the page like in website:
|
||||||
|
|
||||||
<img src="screenshots/multi_apps.png"/>
|
<img src="screenshots/multi_apps.png"/>
|
||||||
|
|
||||||
There is a convenient search bar at the top of the components tree which will help finding
|
There is a convenient search bar at the top of the components tree which will help finding
|
||||||
the components tou want in the tree and also, an element picker can be used to directly select
|
the components tou want in the tree and also, an element picker can be used to directly select
|
||||||
the component you want to focus on in the page which is especially useful when trying to find
|
the component you want to focus on in the page which is especially useful when 1trying to find
|
||||||
what you want. Just click on the elements picker icon and click on the element you want to focus
|
what you want. Just click on the elements picker icon and click on the element you want to focus
|
||||||
on in the page and it will be selected in the devtools accordingly. Hovering any element in the
|
on in the page and it will be selected in the devtools accordingly. Hovering any element in the
|
||||||
page in this mode will highlight it and the same happens anytime in the components tree.
|
page in this mode will highlight it and the same happens anytime in the components tree.
|
||||||
@@ -64,25 +64,18 @@ as its env, props, observed states and all the other variables that are present
|
|||||||
While the props and the env are already present on the actual instance of the component and are
|
While the props and the env are already present on the actual instance of the component and are
|
||||||
pretty explicit by themselves, the observed state value is a bit more complicated to grasp.
|
pretty explicit by themselves, the observed state value is a bit more complicated to grasp.
|
||||||
|
|
||||||
The observed state is actually information about which variables are observed by the component
|
The observed state is actually information about which variables are being observed by the component:
|
||||||
which will trigger a rerender of the component when it is modified. The keys represent which part of the
|
when any property of a reactive object is being read by the component, the component will subscribe
|
||||||
variable is actually observed and the target is the actual variable. For simplicity, the properties
|
to this property which means it will listen to any change that can occur on the property and render
|
||||||
that are not observed by the component are greyed out while the others are in bold. This means that
|
when such a change occurs. This can be visualized easily within the devtools inside of the observed
|
||||||
editing bold ones will trigger a rerender while the greyed out ones will not.
|
state section: observed properties of the reactive object(s) are displayed in bold while the others
|
||||||
|
are greyed out. Do keep in mind that a greyed out property in the observed state of one component
|
||||||
|
may be observed by another and the other way around is also possible. Here is an example for some
|
||||||
|
user Field component:
|
||||||
|
|
||||||
<img src="screenshots/states.png"/>
|
<img src="screenshots/states.png"/>
|
||||||
|
|
||||||
In the given example, we have two keys/target pairs for two different variables. The first one indicates
|
Navigation inside the properties is also similar to the one in console variables: properties have
|
||||||
that adding or removing an element to the array will trigger a rerender since the length will have changed.
|
|
||||||
Replacing the element at index 0, 1 or 2 will also have the same effect as implied by the keys. It doesn't
|
|
||||||
mean that editing the properties of element at index 0, 1 or 2 will rerender the component though. It may
|
|
||||||
be the case for some but this will be described in another keys/target pair. The second keys/target pair
|
|
||||||
is actually the element at index 0 of the first pair. It only has id in the keys meaning that only the
|
|
||||||
id property will actually trigger a rerender the component when modified. Be aware however that the other
|
|
||||||
properties may be in the observed state of another component like a child one in this case. A greyed out
|
|
||||||
property only implies it is not reactive for the selected component and not for the others.
|
|
||||||
|
|
||||||
The navigation inside the properties is also similar to the one in console variables: properties have
|
|
||||||
their prototype displayed and getters will get their value when clicked on (...). It is also possible to
|
their prototype displayed and getters will get their value when clicked on (...). It is also possible to
|
||||||
send any property to the console using the right-click context menu on it and functions can be inspected
|
send any property to the console using the right-click context menu on it and functions can be inspected
|
||||||
in the sources tab as well.
|
in the sources tab as well.
|
||||||
@@ -96,8 +89,10 @@ component's name. Using the left click on the component's name will focus it in
|
|||||||
It is also possible to edit any of the leaf node properties. To do so, you must double click on the
|
It is also possible to edit any of the leaf node properties. To do so, you must double click on the
|
||||||
property's value and modify it using the freshly created input then press enter to apply the changes.
|
property's value and modify it using the freshly created input then press enter to apply the changes.
|
||||||
Do note that the modified values should be written in JSON format in order to be valid (examples:
|
Do note that the modified values should be written in JSON format in order to be valid (examples:
|
||||||
89, "yes", undefined, null, \["hello", 15\], {"a": 1}, true, ...). Whether it has an impact on the
|
89, "yes", undefined, null, \["hello", 15\], {"a": 1}, true, ...). Editing any value will produce a
|
||||||
component or not and whether it produces an error is the responsability of the user.
|
manual render of the component (or the root component of the application in the case of env values).
|
||||||
|
Whether the edition has an impact on the component or not and whether it produces an error is the
|
||||||
|
responsability of the user.
|
||||||
|
|
||||||
<img src="screenshots/edit.png"/>
|
<img src="screenshots/edit.png"/>
|
||||||
|
|
||||||
@@ -117,7 +112,8 @@ are intercepted by the devtools using the record button.
|
|||||||
The second button is used to clear all the events that have been recorded. The select can be used to
|
The second button is used to clear all the events that have been recorded. The select can be used to
|
||||||
switch between the tree view (which shows the causality between renders) and the events log view which
|
switch between the tree view (which shows the causality between renders) and the events log view which
|
||||||
simply displays the events in the exact order they were triggered. In this view, you can expand the create,
|
simply displays the events in the exact order they were triggered. In this view, you can expand the create,
|
||||||
update and destroy events which reveals the component that initiated the event.
|
update and destroy events which reveals the component that initiated the event. Also, a transition line will
|
||||||
|
appear each time a new animation frame has been loaded between events.
|
||||||
|
|
||||||
<img src="screenshots/events_log.png"/>
|
<img src="screenshots/events_log.png"/>
|
||||||
|
|
||||||
@@ -131,20 +127,29 @@ There is also the Trace Renderings and Trace Subscriptions features. These featu
|
|||||||
recording of events and have no effect on the profiler tab. The Trace Renderings option is used to log in
|
recording of events and have no effect on the profiler tab. The Trace Renderings option is used to log in
|
||||||
the console all the render events and allows to show their traceback information. Similarly, the Trace
|
the console all the render events and allows to show their traceback information. Similarly, the Trace
|
||||||
Subscriptions option logs all the properties that caused a render event and also allows to see the traceback
|
Subscriptions option logs all the properties that caused a render event and also allows to see the traceback
|
||||||
of the modification
|
of the modification.
|
||||||
|
|
||||||
<img src="screenshots/trace_rendering.png"/>
|
<img src="screenshots/trace_rendering.png"/>
|
||||||
<img src="screenshots/trace_subscriptions.png"/>
|
<img src="screenshots/trace_subscriptions.png"/>
|
||||||
|
|
||||||
|
The Owl Devtools also allow to inspect iframes coded in Owl: when an Owl iframe is detected in the page,
|
||||||
|
the iframe selector will appear next to the tabs. This allows to switch from an iframe to another easily.
|
||||||
|
Be aware that switching iframes will clear all record events from the profiler tab. Iframes detection is
|
||||||
|
currently not working in the firefox version, we are aware of this issue and will try to address it in the
|
||||||
|
future.
|
||||||
|
|
||||||
|
<img src="screenshots/iframes.png"/>
|
||||||
|
|
||||||
## Options
|
## Options
|
||||||
|
|
||||||
The owl devtools extension has a dark mode feature which defaults to your general devtools settings and can
|
The owl devtools extension has a dark mode feature which defaults to your general devtools settings and can
|
||||||
be toggled using the sun/moon icon at the top-right corner of the tab. All the examples above were created
|
be toggled using the sun/moon icon at the top-right corner of the tab. There is also a refresh button to
|
||||||
with the dark mode enabled. There is also a refresh button to completely reset the owl devtools.
|
completely reset the owl devtools.
|
||||||
|
|
||||||
<img src="screenshots/darkmode.png"/>
|
<img src="screenshots/darkmode.png"/>
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
If the feedback from the page to the devtools seems to be cut, just close the devtools and refresh the page.
|
If the feedback from the page to the devtools seems to be cut, you can first try to use the refresh
|
||||||
|
button mentioned above but if it still doesn't seem to work, just close the devtools and refresh the page.
|
||||||
This will eventually happen any time a tab stays opened for too long without being refreshed.
|
This will eventually happen any time a tab stays opened for too long without being refreshed.
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 333 KiB After Width: | Height: | Size: 545 KiB |
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 387 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 197 KiB After Width: | Height: | Size: 266 KiB |
|
Before Width: | Height: | Size: 185 KiB After Width: | Height: | Size: 320 KiB |
|
After Width: | Height: | Size: 206 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 329 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 311 KiB After Width: | Height: | Size: 536 KiB |
|
Before Width: | Height: | Size: 336 KiB After Width: | Height: | Size: 488 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 177 KiB |
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 182 KiB |
@@ -1850,8 +1850,9 @@ const NO_CALLBACK = () => {
|
|||||||
};
|
};
|
||||||
const objectToString = Object.prototype.toString;
|
const objectToString = Object.prototype.toString;
|
||||||
const objectHasOwnProperty = Object.prototype.hasOwnProperty;
|
const objectHasOwnProperty = Object.prototype.hasOwnProperty;
|
||||||
const SUPPORTED_RAW_TYPES = new Set(["Object", "Array", "Set", "Map", "WeakMap"]);
|
// Use arrays because Array.includes is faster than Set.has for small arrays
|
||||||
const COLLECTION_RAWTYPES = new Set(["Set", "Map", "WeakMap"]);
|
const SUPPORTED_RAW_TYPES = ["Object", "Array", "Set", "Map", "WeakMap"];
|
||||||
|
const COLLECTION_RAW_TYPES = ["Set", "Map", "WeakMap"];
|
||||||
/**
|
/**
|
||||||
* extract "RawType" from strings like "[object RawType]" => this lets us ignore
|
* extract "RawType" from strings like "[object RawType]" => this lets us ignore
|
||||||
* many native objects such as Promise (whose toString is [object Promise])
|
* many native objects such as Promise (whose toString is [object Promise])
|
||||||
@@ -1874,7 +1875,7 @@ function canBeMadeReactive(value) {
|
|||||||
if (typeof value !== "object") {
|
if (typeof value !== "object") {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return SUPPORTED_RAW_TYPES.has(rawType(value));
|
return SUPPORTED_RAW_TYPES.includes(rawType(value));
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Creates a reactive from the given object/callback if possible and returns it,
|
* Creates a reactive from the given object/callback if possible and returns it,
|
||||||
@@ -2044,7 +2045,7 @@ function reactive(target, callback = NO_CALLBACK) {
|
|||||||
const reactivesForTarget = reactiveCache.get(target);
|
const reactivesForTarget = reactiveCache.get(target);
|
||||||
if (!reactivesForTarget.has(callback)) {
|
if (!reactivesForTarget.has(callback)) {
|
||||||
const targetRawType = rawType(target);
|
const targetRawType = rawType(target);
|
||||||
const handler = COLLECTION_RAWTYPES.has(targetRawType)
|
const handler = COLLECTION_RAW_TYPES.includes(targetRawType)
|
||||||
? collectionsProxyHandler(target, callback, targetRawType)
|
? collectionsProxyHandler(target, callback, targetRawType)
|
||||||
: basicProxyHandler(callback);
|
: basicProxyHandler(callback);
|
||||||
const proxy = new Proxy(target, handler);
|
const proxy = new Proxy(target, handler);
|
||||||
@@ -2073,7 +2074,7 @@ function basicProxyHandler(callback) {
|
|||||||
set(target, key, value, receiver) {
|
set(target, key, value, receiver) {
|
||||||
const hadKey = objectHasOwnProperty.call(target, key);
|
const hadKey = objectHasOwnProperty.call(target, key);
|
||||||
const originalValue = Reflect.get(target, key, receiver);
|
const originalValue = Reflect.get(target, key, receiver);
|
||||||
const ret = Reflect.set(target, key, value, receiver);
|
const ret = Reflect.set(target, key, toRaw(value), receiver);
|
||||||
if (!hadKey && objectHasOwnProperty.call(target, key)) {
|
if (!hadKey && objectHasOwnProperty.call(target, key)) {
|
||||||
notifyReactives(target, KEYCHANGES);
|
notifyReactives(target, KEYCHANGES);
|
||||||
}
|
}
|
||||||
@@ -2621,7 +2622,7 @@ function wrapError(fn, hookName) {
|
|||||||
result.catch(() => { }),
|
result.catch(() => { }),
|
||||||
new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
|
new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
|
||||||
]).then((res) => {
|
]).then((res) => {
|
||||||
if (res === TIMEOUT && node.fiber === fiber) {
|
if (res === TIMEOUT && node.fiber === fiber && node.status <= 2) {
|
||||||
console.warn(timeoutError);
|
console.warn(timeoutError);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -3159,8 +3160,14 @@ const helpers = {
|
|||||||
makeRefWrapper,
|
makeRefWrapper,
|
||||||
};
|
};
|
||||||
|
|
||||||
const bdom = { text, createBlock, list, multi, html, toggler, comment };
|
/**
|
||||||
function parseXML$1(xml) {
|
* Parses an XML string into an XML document, throwing errors on parser errors
|
||||||
|
* instead of returning an XML document containing the parseerror.
|
||||||
|
*
|
||||||
|
* @param xml the string to parse
|
||||||
|
* @returns an XML document corresponding to the content of the string
|
||||||
|
*/
|
||||||
|
function parseXML(xml) {
|
||||||
const parser = new DOMParser();
|
const parser = new DOMParser();
|
||||||
const doc = parser.parseFromString(xml, "text/xml");
|
const doc = parser.parseFromString(xml, "text/xml");
|
||||||
if (doc.getElementsByTagName("parsererror").length) {
|
if (doc.getElementsByTagName("parsererror").length) {
|
||||||
@@ -3187,7 +3194,9 @@ function parseXML$1(xml) {
|
|||||||
throw new OwlError(msg);
|
throw new OwlError(msg);
|
||||||
}
|
}
|
||||||
return doc;
|
return doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const bdom = { text, createBlock, list, multi, html, toggler, comment };
|
||||||
class TemplateSet {
|
class TemplateSet {
|
||||||
constructor(config = {}) {
|
constructor(config = {}) {
|
||||||
this.rawTemplates = Object.create(globalTemplates);
|
this.rawTemplates = Object.create(globalTemplates);
|
||||||
@@ -3197,8 +3206,16 @@ class TemplateSet {
|
|||||||
this.translateFn = config.translateFn;
|
this.translateFn = config.translateFn;
|
||||||
this.translatableAttributes = config.translatableAttributes;
|
this.translatableAttributes = config.translatableAttributes;
|
||||||
if (config.templates) {
|
if (config.templates) {
|
||||||
this.addTemplates(config.templates);
|
if (config.templates instanceof Document || typeof config.templates === "string") {
|
||||||
|
this.addTemplates(config.templates);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
for (const name in config.templates) {
|
||||||
|
this.addTemplate(name, config.templates[name]);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
this.getRawTemplate = config.getTemplate;
|
||||||
}
|
}
|
||||||
static registerTemplate(name, fn) {
|
static registerTemplate(name, fn) {
|
||||||
globalTemplates[name] = fn;
|
globalTemplates[name] = fn;
|
||||||
@@ -3228,15 +3245,16 @@ class TemplateSet {
|
|||||||
// empty string
|
// empty string
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
xml = xml instanceof Document ? xml : parseXML$1(xml);
|
xml = xml instanceof Document ? xml : parseXML(xml);
|
||||||
for (const template of xml.querySelectorAll("[t-name]")) {
|
for (const template of xml.querySelectorAll("[t-name]")) {
|
||||||
const name = template.getAttribute("t-name");
|
const name = template.getAttribute("t-name");
|
||||||
this.addTemplate(name, template);
|
this.addTemplate(name, template);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getTemplate(name) {
|
getTemplate(name) {
|
||||||
|
var _a;
|
||||||
if (!(name in this.templates)) {
|
if (!(name in this.templates)) {
|
||||||
const rawTemplate = this.rawTemplates[name];
|
const rawTemplate = ((_a = this.getRawTemplate) === null || _a === void 0 ? void 0 : _a.call(this, name)) || this.rawTemplates[name];
|
||||||
if (rawTemplate === undefined) {
|
if (rawTemplate === undefined) {
|
||||||
let extraInfo = "";
|
let extraInfo = "";
|
||||||
try {
|
try {
|
||||||
@@ -3494,7 +3512,7 @@ function compileExprToArray(expr) {
|
|||||||
const localVars = new Set();
|
const localVars = new Set();
|
||||||
const tokens = tokenize(expr);
|
const tokens = tokenize(expr);
|
||||||
let i = 0;
|
let i = 0;
|
||||||
let stack = []; // to track last opening [ or {
|
let stack = []; // to track last opening (, [ or {
|
||||||
while (i < tokens.length) {
|
while (i < tokens.length) {
|
||||||
let token = tokens[i];
|
let token = tokens[i];
|
||||||
let prevToken = tokens[i - 1];
|
let prevToken = tokens[i - 1];
|
||||||
@@ -3503,10 +3521,12 @@ function compileExprToArray(expr) {
|
|||||||
switch (token.type) {
|
switch (token.type) {
|
||||||
case "LEFT_BRACE":
|
case "LEFT_BRACE":
|
||||||
case "LEFT_BRACKET":
|
case "LEFT_BRACKET":
|
||||||
|
case "LEFT_PAREN":
|
||||||
stack.push(token.type);
|
stack.push(token.type);
|
||||||
break;
|
break;
|
||||||
case "RIGHT_BRACE":
|
case "RIGHT_BRACE":
|
||||||
case "RIGHT_BRACKET":
|
case "RIGHT_BRACKET":
|
||||||
|
case "RIGHT_PAREN":
|
||||||
stack.pop();
|
stack.pop();
|
||||||
}
|
}
|
||||||
let isVar = token.type === "SYMBOL" && !RESERVED_WORDS.includes(token.value);
|
let isVar = token.type === "SYMBOL" && !RESERVED_WORDS.includes(token.value);
|
||||||
@@ -3618,6 +3638,13 @@ function isProp(tag, key) {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Returns a template literal that evaluates to str. You can add interpolation
|
||||||
|
* sigils into the string if required
|
||||||
|
*/
|
||||||
|
function toStringExpression(str) {
|
||||||
|
return `\`${str.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/, "\\${")}\``;
|
||||||
|
}
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// BlockDescription
|
// BlockDescription
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
@@ -3798,15 +3825,14 @@ class CodeGenerator {
|
|||||||
mainCode.push(``);
|
mainCode.push(``);
|
||||||
for (let block of this.blocks) {
|
for (let block of this.blocks) {
|
||||||
if (block.dom) {
|
if (block.dom) {
|
||||||
let xmlString = block.asXmlString();
|
let xmlString = toStringExpression(block.asXmlString());
|
||||||
xmlString = xmlString.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
|
|
||||||
if (block.dynamicTagName) {
|
if (block.dynamicTagName) {
|
||||||
xmlString = xmlString.replace(/^<\w+/, `<\${tag || '${block.dom.nodeName}'}`);
|
xmlString = xmlString.replace(/^`<\w+/, `\`<\${tag || '${block.dom.nodeName}'}`);
|
||||||
xmlString = xmlString.replace(/\w+>$/, `\${tag || '${block.dom.nodeName}'}>`);
|
xmlString = xmlString.replace(/\w+>`$/, `\${tag || '${block.dom.nodeName}'}>\``);
|
||||||
mainCode.push(`let ${block.blockName} = tag => createBlock(\`${xmlString}\`);`);
|
mainCode.push(`let ${block.blockName} = tag => createBlock(${xmlString});`);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mainCode.push(`let ${block.blockName} = createBlock(\`${xmlString}\`);`);
|
mainCode.push(`let ${block.blockName} = createBlock(${xmlString});`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3984,7 +4010,7 @@ class CodeGenerator {
|
|||||||
const isNewBlock = !block || forceNewBlock;
|
const isNewBlock = !block || forceNewBlock;
|
||||||
if (isNewBlock) {
|
if (isNewBlock) {
|
||||||
block = this.createBlock(block, "comment", ctx);
|
block = this.createBlock(block, "comment", ctx);
|
||||||
this.insertBlock(`comment(\`${ast.value}\`)`, block, {
|
this.insertBlock(`comment(${toStringExpression(ast.value)})`, block, {
|
||||||
...ctx,
|
...ctx,
|
||||||
forceNewBlock: forceNewBlock && !block,
|
forceNewBlock: forceNewBlock && !block,
|
||||||
});
|
});
|
||||||
@@ -4006,7 +4032,7 @@ class CodeGenerator {
|
|||||||
}
|
}
|
||||||
if (!block || forceNewBlock) {
|
if (!block || forceNewBlock) {
|
||||||
block = this.createBlock(block, "text", ctx);
|
block = this.createBlock(block, "text", ctx);
|
||||||
this.insertBlock(`text(\`${value}\`)`, block, {
|
this.insertBlock(`text(${toStringExpression(value)})`, block, {
|
||||||
...ctx,
|
...ctx,
|
||||||
forceNewBlock: forceNewBlock && !block,
|
forceNewBlock: forceNewBlock && !block,
|
||||||
});
|
});
|
||||||
@@ -4227,7 +4253,8 @@ class CodeGenerator {
|
|||||||
expr = compileExpr(ast.expr);
|
expr = compileExpr(ast.expr);
|
||||||
if (ast.defaultValue) {
|
if (ast.defaultValue) {
|
||||||
this.helpers.add("withDefault");
|
this.helpers.add("withDefault");
|
||||||
expr = `withDefault(${expr}, \`${ast.defaultValue}\`)`;
|
// FIXME: defaultValue is not translated
|
||||||
|
expr = `withDefault(${expr}, ${toStringExpression(ast.defaultValue)})`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!block || forceNewBlock) {
|
if (!block || forceNewBlock) {
|
||||||
@@ -4480,7 +4507,7 @@ class CodeGenerator {
|
|||||||
this.addLine(`${ctxVar}[zero] = ${bl};`);
|
this.addLine(`${ctxVar}[zero] = ${bl};`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const key = `key + \`${this.generateComponentKey()}\``;
|
const key = this.generateComponentKey();
|
||||||
if (isDynamic) {
|
if (isDynamic) {
|
||||||
const templateVar = generateId("template");
|
const templateVar = generateId("template");
|
||||||
if (!this.staticDefs.find((d) => d.id === "call")) {
|
if (!this.staticDefs.find((d) => d.id === "call")) {
|
||||||
@@ -4532,12 +4559,12 @@ class CodeGenerator {
|
|||||||
else {
|
else {
|
||||||
let value;
|
let value;
|
||||||
if (ast.defaultValue) {
|
if (ast.defaultValue) {
|
||||||
const defaultValue = ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue;
|
const defaultValue = toStringExpression(ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue);
|
||||||
if (ast.value) {
|
if (ast.value) {
|
||||||
value = `withDefault(${expr}, \`${defaultValue}\`)`;
|
value = `withDefault(${expr}, ${defaultValue})`;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
value = `\`${defaultValue}\``;
|
value = defaultValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -4548,12 +4575,12 @@ class CodeGenerator {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
generateComponentKey() {
|
generateComponentKey(currentKey = "key") {
|
||||||
const parts = [generateId("__")];
|
const parts = [generateId("__")];
|
||||||
for (let i = 0; i < this.target.loopLevel; i++) {
|
for (let i = 0; i < this.target.loopLevel; i++) {
|
||||||
parts.push(`\${key${i + 1}}`);
|
parts.push(`\${key${i + 1}}`);
|
||||||
}
|
}
|
||||||
return parts.join("__");
|
return `${currentKey} + \`${parts.join("__")}\``;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Formats a prop name and value into a string suitable to be inserted in the
|
* Formats a prop name and value into a string suitable to be inserted in the
|
||||||
@@ -4567,7 +4594,12 @@ class CodeGenerator {
|
|||||||
* "onClick.bind" "onClick" "onClick: bind(ctx, ctx['onClick'])"
|
* "onClick.bind" "onClick" "onClick: bind(ctx, ctx['onClick'])"
|
||||||
*/
|
*/
|
||||||
formatProp(name, value) {
|
formatProp(name, value) {
|
||||||
value = this.captureExpression(value);
|
if (name.endsWith(".translate")) {
|
||||||
|
value = toStringExpression(this.translateFn(value));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
value = this.captureExpression(value);
|
||||||
|
}
|
||||||
if (name.includes(".")) {
|
if (name.includes(".")) {
|
||||||
let [_name, suffix] = name.split(".");
|
let [_name, suffix] = name.split(".");
|
||||||
name = _name;
|
name = _name;
|
||||||
@@ -4576,6 +4608,7 @@ class CodeGenerator {
|
|||||||
value = `(${value}).bind(this)`;
|
value = `(${value}).bind(this)`;
|
||||||
break;
|
break;
|
||||||
case "alike":
|
case "alike":
|
||||||
|
case "translate":
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new OwlError("Invalid prop suffix");
|
throw new OwlError("Invalid prop suffix");
|
||||||
@@ -4644,7 +4677,6 @@ class CodeGenerator {
|
|||||||
this.addLine(`${propVar}.slots = markRaw(Object.assign(${slotDef}, ${propVar}.slots))`);
|
this.addLine(`${propVar}.slots = markRaw(Object.assign(${slotDef}, ${propVar}.slots))`);
|
||||||
}
|
}
|
||||||
// cmap key
|
// cmap key
|
||||||
const key = this.generateComponentKey();
|
|
||||||
let expr;
|
let expr;
|
||||||
if (ast.isDynamic) {
|
if (ast.isDynamic) {
|
||||||
expr = generateId("Comp");
|
expr = generateId("Comp");
|
||||||
@@ -4660,7 +4692,7 @@ class CodeGenerator {
|
|||||||
// todo: check the forcenewblock condition
|
// todo: check the forcenewblock condition
|
||||||
this.insertAnchor(block);
|
this.insertAnchor(block);
|
||||||
}
|
}
|
||||||
let keyArg = `key + \`${key}\``;
|
let keyArg = this.generateComponentKey();
|
||||||
if (ctx.tKeyExpr) {
|
if (ctx.tKeyExpr) {
|
||||||
keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
|
keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
|
||||||
}
|
}
|
||||||
@@ -4733,7 +4765,7 @@ class CodeGenerator {
|
|||||||
}
|
}
|
||||||
let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
|
let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
|
||||||
if (isMultiple) {
|
if (isMultiple) {
|
||||||
key = `${key} + \`${this.generateComponentKey()}\``;
|
key = this.generateComponentKey(key);
|
||||||
}
|
}
|
||||||
const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
|
const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
|
||||||
const scope = this.getPropString(props, dynProps);
|
const scope = this.getPropString(props, dynProps);
|
||||||
@@ -4774,7 +4806,6 @@ class CodeGenerator {
|
|||||||
}
|
}
|
||||||
let { block } = ctx;
|
let { block } = ctx;
|
||||||
const name = this.compileInNewTarget("slot", ast.content, ctx);
|
const name = this.compileInNewTarget("slot", ast.content, ctx);
|
||||||
const key = this.generateComponentKey();
|
|
||||||
let ctxStr = "ctx";
|
let ctxStr = "ctx";
|
||||||
if (this.target.loopLevel || !this.hasSafeContext) {
|
if (this.target.loopLevel || !this.hasSafeContext) {
|
||||||
ctxStr = generateId("ctx");
|
ctxStr = generateId("ctx");
|
||||||
@@ -4787,7 +4818,8 @@ class CodeGenerator {
|
|||||||
expr: `app.createComponent(null, false, true, false, false)`,
|
expr: `app.createComponent(null, false, true, false, false)`,
|
||||||
});
|
});
|
||||||
const target = compileExpr(ast.target);
|
const target = compileExpr(ast.target);
|
||||||
const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, key + \`${key}\`, node, ctx, Portal)`;
|
const key = this.generateComponentKey();
|
||||||
|
const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, ${key}, node, ctx, Portal)`;
|
||||||
if (block) {
|
if (block) {
|
||||||
this.insertAnchor(block);
|
this.insertAnchor(block);
|
||||||
}
|
}
|
||||||
@@ -4946,9 +4978,9 @@ function parseDOMNode(node, ctx) {
|
|||||||
const isSelect = tagName === "select";
|
const isSelect = tagName === "select";
|
||||||
const isCheckboxInput = isInput && typeAttr === "checkbox";
|
const isCheckboxInput = isInput && typeAttr === "checkbox";
|
||||||
const isRadioInput = isInput && typeAttr === "radio";
|
const isRadioInput = isInput && typeAttr === "radio";
|
||||||
const hasLazyMod = attr.includes(".lazy");
|
|
||||||
const hasNumberMod = attr.includes(".number");
|
|
||||||
const hasTrimMod = attr.includes(".trim");
|
const hasTrimMod = attr.includes(".trim");
|
||||||
|
const hasLazyMod = hasTrimMod || attr.includes(".lazy");
|
||||||
|
const hasNumberMod = attr.includes(".number");
|
||||||
const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
|
const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
|
||||||
model = {
|
model = {
|
||||||
baseExpr,
|
baseExpr,
|
||||||
@@ -5279,14 +5311,14 @@ function parseComponent(node, ctx) {
|
|||||||
// be ignored)
|
// be ignored)
|
||||||
let el = slotNode.parentElement;
|
let el = slotNode.parentElement;
|
||||||
let isInSubComponent = false;
|
let isInSubComponent = false;
|
||||||
while (el !== clone) {
|
while (el && el !== clone) {
|
||||||
if (el.hasAttribute("t-component") || el.tagName[0] === el.tagName[0].toUpperCase()) {
|
if (el.hasAttribute("t-component") || el.tagName[0] === el.tagName[0].toUpperCase()) {
|
||||||
isInSubComponent = true;
|
isInSubComponent = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
el = el.parentElement;
|
el = el.parentElement;
|
||||||
}
|
}
|
||||||
if (isInSubComponent) {
|
if (isInSubComponent || !el) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
slotNode.removeAttribute("t-set-slot");
|
slotNode.removeAttribute("t-set-slot");
|
||||||
@@ -5494,41 +5526,6 @@ function normalizeTEscTOut(el) {
|
|||||||
function normalizeXML(el) {
|
function normalizeXML(el) {
|
||||||
normalizeTIf(el);
|
normalizeTIf(el);
|
||||||
normalizeTEscTOut(el);
|
normalizeTEscTOut(el);
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Parses an XML string into an XML document, throwing errors on parser errors
|
|
||||||
* instead of returning an XML document containing the parseerror.
|
|
||||||
*
|
|
||||||
* @param xml the string to parse
|
|
||||||
* @returns an XML document corresponding to the content of the string
|
|
||||||
*/
|
|
||||||
function parseXML(xml) {
|
|
||||||
const parser = new DOMParser();
|
|
||||||
const doc = parser.parseFromString(xml, "text/xml");
|
|
||||||
if (doc.getElementsByTagName("parsererror").length) {
|
|
||||||
let msg = "Invalid XML in template.";
|
|
||||||
const parsererrorText = doc.getElementsByTagName("parsererror")[0].textContent;
|
|
||||||
if (parsererrorText) {
|
|
||||||
msg += "\nThe parser has produced the following error message:\n" + parsererrorText;
|
|
||||||
const re = /\d+/g;
|
|
||||||
const firstMatch = re.exec(parsererrorText);
|
|
||||||
if (firstMatch) {
|
|
||||||
const lineNumber = Number(firstMatch[0]);
|
|
||||||
const line = xml.split("\n")[lineNumber - 1];
|
|
||||||
const secondMatch = re.exec(parsererrorText);
|
|
||||||
if (line && secondMatch) {
|
|
||||||
const columnIndex = Number(secondMatch[0]) - 1;
|
|
||||||
if (line[columnIndex]) {
|
|
||||||
msg +=
|
|
||||||
`\nThe error might be located at xml line ${lineNumber} column ${columnIndex}\n` +
|
|
||||||
`${line}\n${"-".repeat(columnIndex - 1)}^`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new OwlError(msg);
|
|
||||||
}
|
|
||||||
return doc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function compile(template, options = {}) {
|
function compile(template, options = {}) {
|
||||||
@@ -5555,7 +5552,7 @@ function compile(template, options = {}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// do not modify manually. This file is generated by the release script.
|
// do not modify manually. This file is generated by the release script.
|
||||||
const version = "2.2.6";
|
const version = "2.3.0";
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// Scheduler
|
// Scheduler
|
||||||
@@ -5902,7 +5899,7 @@ function useChildSubEnv(envExtension) {
|
|||||||
*
|
*
|
||||||
* @template T
|
* @template T
|
||||||
* @param {Effect<T>} effect the effect to run on component mount and/or patch
|
* @param {Effect<T>} effect the effect to run on component mount and/or patch
|
||||||
* @param {()=>T} [computeDependencies=()=>[NaN]] a callback to compute
|
* @param {()=>[...T]} [computeDependencies=()=>[NaN]] a callback to compute
|
||||||
* dependencies that will decide if the effect needs to be cleaned up and
|
* dependencies that will decide if the effect needs to be cleaned up and
|
||||||
* run again. If the dependencies did not change, the effect will not run
|
* run again. If the dependencies did not change, the effect will not run
|
||||||
* again. The default value returns an array containing only NaN because
|
* again. The default value returns an array containing only NaN because
|
||||||
@@ -5981,9 +5978,9 @@ TemplateSet.prototype._compileTemplate = function _compileTemplate(name, templat
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export { App, Component, EventBus, OwlError, __info__, blockDom, loadFile, markRaw, markup, mount, onError, onMounted, onPatched, onRendered, onWillDestroy, onWillPatch, onWillRender, onWillStart, onWillUnmount, onWillUpdateProps, reactive, status, toRaw, useChildSubEnv, useComponent, useEffect, useEnv, useExternalListener, useRef, useState, useSubEnv, validate, validateType, whenReady, xml };
|
export { App, Component, EventBus, OwlError, __info__, batched, blockDom, loadFile, markRaw, markup, mount, onError, onMounted, onPatched, onRendered, onWillDestroy, onWillPatch, onWillRender, onWillStart, onWillUnmount, onWillUpdateProps, reactive, status, toRaw, useChildSubEnv, useComponent, useEffect, useEnv, useExternalListener, useRef, useState, useSubEnv, validate, validateType, whenReady, xml };
|
||||||
|
|
||||||
|
|
||||||
__info__.date = '2023-09-25T11:48:01.531Z';
|
__info__.date = '2024-07-25T13:13:44.371Z';
|
||||||
__info__.hash = '752160f';
|
__info__.hash = '0cde4b8';
|
||||||
__info__.url = 'https://github.com/odoo/owl';
|
__info__.url = 'https://github.com/odoo/owl';
|
||||||
|
|||||||
@@ -41,9 +41,6 @@ const loadFile = (path) => {
|
|||||||
* Make an iframe, with all the js, css and xml properly injected.
|
* Make an iframe, with all the js, css and xml properly injected.
|
||||||
*/
|
*/
|
||||||
function makeCodeIframe(js, css, xml) {
|
function makeCodeIframe(js, css, xml) {
|
||||||
// escape backticks in the xml so they don't close the template string
|
|
||||||
const escapedXml = xml.replace(/`/g, '\\\`');
|
|
||||||
|
|
||||||
const iframe = document.createElement("iframe");
|
const iframe = document.createElement("iframe");
|
||||||
iframe.onload = () => {
|
iframe.onload = () => {
|
||||||
const doc = iframe.contentDocument;
|
const doc = iframe.contentDocument;
|
||||||
@@ -55,6 +52,8 @@ function makeCodeIframe(js, css, xml) {
|
|||||||
|
|
||||||
const script = doc.createElement("script");
|
const script = doc.createElement("script");
|
||||||
script.type = "module";
|
script.type = "module";
|
||||||
|
// escape characters with special meaning in template literals
|
||||||
|
const escapedXml = xml.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/, "\\${");
|
||||||
script.textContent = `const TEMPLATES = \`${escapedXml}\`\n${js}`;
|
script.textContent = `const TEMPLATES = \`${escapedXml}\`\n${js}`;
|
||||||
doc.body.appendChild(script);
|
doc.body.appendChild(script);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@odoo/owl",
|
"name": "@odoo/owl",
|
||||||
"version": "2.2.6",
|
"version": "2.3.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@odoo/owl",
|
"name": "@odoo/owl",
|
||||||
"version": "2.2.6",
|
"version": "2.3.0",
|
||||||
"description": "Odoo Web Library (OWL)",
|
"description": "Odoo Web Library (OWL)",
|
||||||
"main": "dist/owl.cjs.js",
|
"main": "dist/owl.cjs.js",
|
||||||
"module": "dist/owl.es.js",
|
"module": "dist/owl.es.js",
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { OwlError } from "./owl_error";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses an XML string into an XML document, throwing errors on parser errors
|
||||||
|
* instead of returning an XML document containing the parseerror.
|
||||||
|
*
|
||||||
|
* @param xml the string to parse
|
||||||
|
* @returns an XML document corresponding to the content of the string
|
||||||
|
*/
|
||||||
|
export function parseXML(xml: string): XMLDocument {
|
||||||
|
const parser = new DOMParser();
|
||||||
|
const doc = parser.parseFromString(xml, "text/xml");
|
||||||
|
if (doc.getElementsByTagName("parsererror").length) {
|
||||||
|
let msg = "Invalid XML in template.";
|
||||||
|
const parsererrorText = doc.getElementsByTagName("parsererror")[0].textContent;
|
||||||
|
if (parsererrorText) {
|
||||||
|
msg += "\nThe parser has produced the following error message:\n" + parsererrorText;
|
||||||
|
const re = /\d+/g;
|
||||||
|
const firstMatch = re.exec(parsererrorText);
|
||||||
|
if (firstMatch) {
|
||||||
|
const lineNumber = Number(firstMatch[0]);
|
||||||
|
const line = xml.split("\n")[lineNumber - 1];
|
||||||
|
const secondMatch = re.exec(parsererrorText);
|
||||||
|
if (line && secondMatch) {
|
||||||
|
const columnIndex = Number(secondMatch[0]) - 1;
|
||||||
|
if (line[columnIndex]) {
|
||||||
|
msg +=
|
||||||
|
`\nThe error might be located at xml line ${lineNumber} column ${columnIndex}\n` +
|
||||||
|
`${line}\n${"-".repeat(columnIndex - 1)}^`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new OwlError(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
return doc;
|
||||||
|
}
|
||||||
@@ -82,6 +82,14 @@ function isProp(tag: string, key: string): boolean {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a template literal that evaluates to str. You can add interpolation
|
||||||
|
* sigils into the string if required
|
||||||
|
*/
|
||||||
|
function toStringExpression(str: string) {
|
||||||
|
return `\`${str.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/, "\\${")}\``;
|
||||||
|
}
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// BlockDescription
|
// BlockDescription
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
@@ -311,14 +319,13 @@ export class CodeGenerator {
|
|||||||
mainCode.push(``);
|
mainCode.push(``);
|
||||||
for (let block of this.blocks) {
|
for (let block of this.blocks) {
|
||||||
if (block.dom) {
|
if (block.dom) {
|
||||||
let xmlString = block.asXmlString();
|
let xmlString = toStringExpression(block.asXmlString());
|
||||||
xmlString = xmlString.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
|
|
||||||
if (block.dynamicTagName) {
|
if (block.dynamicTagName) {
|
||||||
xmlString = xmlString.replace(/^<\w+/, `<\${tag || '${block.dom.nodeName}'}`);
|
xmlString = xmlString.replace(/^`<\w+/, `\`<\${tag || '${block.dom.nodeName}'}`);
|
||||||
xmlString = xmlString.replace(/\w+>$/, `\${tag || '${block.dom.nodeName}'}>`);
|
xmlString = xmlString.replace(/\w+>`$/, `\${tag || '${block.dom.nodeName}'}>\``);
|
||||||
mainCode.push(`let ${block.blockName} = tag => createBlock(\`${xmlString}\`);`);
|
mainCode.push(`let ${block.blockName} = tag => createBlock(${xmlString});`);
|
||||||
} else {
|
} else {
|
||||||
mainCode.push(`let ${block.blockName} = createBlock(\`${xmlString}\`);`);
|
mainCode.push(`let ${block.blockName} = createBlock(${xmlString});`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -515,7 +522,7 @@ export class CodeGenerator {
|
|||||||
const isNewBlock = !block || forceNewBlock;
|
const isNewBlock = !block || forceNewBlock;
|
||||||
if (isNewBlock) {
|
if (isNewBlock) {
|
||||||
block = this.createBlock(block, "comment", ctx);
|
block = this.createBlock(block, "comment", ctx);
|
||||||
this.insertBlock(`comment(\`${ast.value}\`)`, block, {
|
this.insertBlock(`comment(${toStringExpression(ast.value)})`, block, {
|
||||||
...ctx,
|
...ctx,
|
||||||
forceNewBlock: forceNewBlock && !block,
|
forceNewBlock: forceNewBlock && !block,
|
||||||
});
|
});
|
||||||
@@ -539,7 +546,7 @@ export class CodeGenerator {
|
|||||||
|
|
||||||
if (!block || forceNewBlock) {
|
if (!block || forceNewBlock) {
|
||||||
block = this.createBlock(block, "text", ctx);
|
block = this.createBlock(block, "text", ctx);
|
||||||
this.insertBlock(`text(\`${value}\`)`, block, {
|
this.insertBlock(`text(${toStringExpression(value)})`, block, {
|
||||||
...ctx,
|
...ctx,
|
||||||
forceNewBlock: forceNewBlock && !block,
|
forceNewBlock: forceNewBlock && !block,
|
||||||
});
|
});
|
||||||
@@ -774,7 +781,8 @@ export class CodeGenerator {
|
|||||||
expr = compileExpr(ast.expr);
|
expr = compileExpr(ast.expr);
|
||||||
if (ast.defaultValue) {
|
if (ast.defaultValue) {
|
||||||
this.helpers.add("withDefault");
|
this.helpers.add("withDefault");
|
||||||
expr = `withDefault(${expr}, \`${ast.defaultValue}\`)`;
|
// FIXME: defaultValue is not translated
|
||||||
|
expr = `withDefault(${expr}, ${toStringExpression(ast.defaultValue)})`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!block || forceNewBlock) {
|
if (!block || forceNewBlock) {
|
||||||
@@ -1039,7 +1047,7 @@ export class CodeGenerator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const key = `key + \`${this.generateComponentKey()}\``;
|
const key = this.generateComponentKey();
|
||||||
if (isDynamic) {
|
if (isDynamic) {
|
||||||
const templateVar = generateId("template");
|
const templateVar = generateId("template");
|
||||||
if (!this.staticDefs.find((d) => d.id === "call")) {
|
if (!this.staticDefs.find((d) => d.id === "call")) {
|
||||||
@@ -1091,11 +1099,13 @@ export class CodeGenerator {
|
|||||||
} else {
|
} else {
|
||||||
let value: string;
|
let value: string;
|
||||||
if (ast.defaultValue) {
|
if (ast.defaultValue) {
|
||||||
const defaultValue = ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue;
|
const defaultValue = toStringExpression(
|
||||||
|
ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue
|
||||||
|
);
|
||||||
if (ast.value) {
|
if (ast.value) {
|
||||||
value = `withDefault(${expr}, \`${defaultValue}\`)`;
|
value = `withDefault(${expr}, ${defaultValue})`;
|
||||||
} else {
|
} else {
|
||||||
value = `\`${defaultValue}\``;
|
value = defaultValue;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
value = expr;
|
value = expr;
|
||||||
@@ -1106,12 +1116,12 @@ export class CodeGenerator {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
generateComponentKey() {
|
generateComponentKey(currentKey: string = "key") {
|
||||||
const parts = [generateId("__")];
|
const parts = [generateId("__")];
|
||||||
for (let i = 0; i < this.target.loopLevel; i++) {
|
for (let i = 0; i < this.target.loopLevel; i++) {
|
||||||
parts.push(`\${key${i + 1}}`);
|
parts.push(`\${key${i + 1}}`);
|
||||||
}
|
}
|
||||||
return parts.join("__");
|
return `${currentKey} + \`${parts.join("__")}\``;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1126,7 +1136,11 @@ export class CodeGenerator {
|
|||||||
* "onClick.bind" "onClick" "onClick: bind(ctx, ctx['onClick'])"
|
* "onClick.bind" "onClick" "onClick: bind(ctx, ctx['onClick'])"
|
||||||
*/
|
*/
|
||||||
formatProp(name: string, value: string): string {
|
formatProp(name: string, value: string): string {
|
||||||
value = this.captureExpression(value);
|
if (name.endsWith(".translate")) {
|
||||||
|
value = toStringExpression(this.translateFn(value));
|
||||||
|
} else {
|
||||||
|
value = this.captureExpression(value);
|
||||||
|
}
|
||||||
if (name.includes(".")) {
|
if (name.includes(".")) {
|
||||||
let [_name, suffix] = name.split(".");
|
let [_name, suffix] = name.split(".");
|
||||||
name = _name;
|
name = _name;
|
||||||
@@ -1135,6 +1149,7 @@ export class CodeGenerator {
|
|||||||
value = `(${value}).bind(this)`;
|
value = `(${value}).bind(this)`;
|
||||||
break;
|
break;
|
||||||
case "alike":
|
case "alike":
|
||||||
|
case "translate":
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new OwlError("Invalid prop suffix");
|
throw new OwlError("Invalid prop suffix");
|
||||||
@@ -1214,7 +1229,6 @@ export class CodeGenerator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// cmap key
|
// cmap key
|
||||||
const key = this.generateComponentKey();
|
|
||||||
let expr: string;
|
let expr: string;
|
||||||
if (ast.isDynamic) {
|
if (ast.isDynamic) {
|
||||||
expr = generateId("Comp");
|
expr = generateId("Comp");
|
||||||
@@ -1232,7 +1246,7 @@ export class CodeGenerator {
|
|||||||
this.insertAnchor(block);
|
this.insertAnchor(block);
|
||||||
}
|
}
|
||||||
|
|
||||||
let keyArg = `key + \`${key}\``;
|
let keyArg = this.generateComponentKey();
|
||||||
if (ctx.tKeyExpr) {
|
if (ctx.tKeyExpr) {
|
||||||
keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
|
keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
|
||||||
}
|
}
|
||||||
@@ -1311,7 +1325,7 @@ export class CodeGenerator {
|
|||||||
}
|
}
|
||||||
let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
|
let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
|
||||||
if (isMultiple) {
|
if (isMultiple) {
|
||||||
key = `${key} + \`${this.generateComponentKey()}\``;
|
key = this.generateComponentKey(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
|
const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
|
||||||
@@ -1354,7 +1368,6 @@ export class CodeGenerator {
|
|||||||
|
|
||||||
let { block } = ctx;
|
let { block } = ctx;
|
||||||
const name = this.compileInNewTarget("slot", ast.content, ctx);
|
const name = this.compileInNewTarget("slot", ast.content, ctx);
|
||||||
const key = this.generateComponentKey();
|
|
||||||
let ctxStr = "ctx";
|
let ctxStr = "ctx";
|
||||||
if (this.target.loopLevel || !this.hasSafeContext) {
|
if (this.target.loopLevel || !this.hasSafeContext) {
|
||||||
ctxStr = generateId("ctx");
|
ctxStr = generateId("ctx");
|
||||||
@@ -1368,7 +1381,8 @@ export class CodeGenerator {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const target = compileExpr(ast.target);
|
const target = compileExpr(ast.target);
|
||||||
const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, key + \`${key}\`, node, ctx, Portal)`;
|
const key = this.generateComponentKey();
|
||||||
|
const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, ${key}, node, ctx, Portal)`;
|
||||||
if (block) {
|
if (block) {
|
||||||
this.insertAnchor(block);
|
this.insertAnchor(block);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ export function compileExprToArray(expr: string): Token[] {
|
|||||||
const localVars = new Set<string>();
|
const localVars = new Set<string>();
|
||||||
const tokens = tokenize(expr);
|
const tokens = tokenize(expr);
|
||||||
let i = 0;
|
let i = 0;
|
||||||
let stack = []; // to track last opening [ or {
|
let stack = []; // to track last opening (, [ or {
|
||||||
|
|
||||||
while (i < tokens.length) {
|
while (i < tokens.length) {
|
||||||
let token = tokens[i];
|
let token = tokens[i];
|
||||||
@@ -279,10 +279,12 @@ export function compileExprToArray(expr: string): Token[] {
|
|||||||
switch (token.type) {
|
switch (token.type) {
|
||||||
case "LEFT_BRACE":
|
case "LEFT_BRACE":
|
||||||
case "LEFT_BRACKET":
|
case "LEFT_BRACKET":
|
||||||
|
case "LEFT_PAREN":
|
||||||
stack.push(token.type);
|
stack.push(token.type);
|
||||||
break;
|
break;
|
||||||
case "RIGHT_BRACE":
|
case "RIGHT_BRACE":
|
||||||
case "RIGHT_BRACKET":
|
case "RIGHT_BRACKET":
|
||||||
|
case "RIGHT_PAREN":
|
||||||
stack.pop();
|
stack.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { OwlError } from "../common/owl_error";
|
import { OwlError } from "../common/owl_error";
|
||||||
|
import { parseXML } from "../common/utils";
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// AST Type definition
|
// AST Type definition
|
||||||
@@ -366,9 +367,9 @@ function parseDOMNode(node: Element, ctx: ParsingContext): AST | null {
|
|||||||
const isSelect = tagName === "select";
|
const isSelect = tagName === "select";
|
||||||
const isCheckboxInput = isInput && typeAttr === "checkbox";
|
const isCheckboxInput = isInput && typeAttr === "checkbox";
|
||||||
const isRadioInput = isInput && typeAttr === "radio";
|
const isRadioInput = isInput && typeAttr === "radio";
|
||||||
const hasLazyMod = attr.includes(".lazy");
|
|
||||||
const hasNumberMod = attr.includes(".number");
|
|
||||||
const hasTrimMod = attr.includes(".trim");
|
const hasTrimMod = attr.includes(".trim");
|
||||||
|
const hasLazyMod = hasTrimMod || attr.includes(".lazy");
|
||||||
|
const hasNumberMod = attr.includes(".number");
|
||||||
const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
|
const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
|
||||||
|
|
||||||
model = {
|
model = {
|
||||||
@@ -740,14 +741,14 @@ function parseComponent(node: Element, ctx: ParsingContext): AST | null {
|
|||||||
// be ignored)
|
// be ignored)
|
||||||
let el = slotNode.parentElement!;
|
let el = slotNode.parentElement!;
|
||||||
let isInSubComponent = false;
|
let isInSubComponent = false;
|
||||||
while (el !== clone) {
|
while (el && el !== clone) {
|
||||||
if (el!.hasAttribute("t-component") || el!.tagName[0] === el!.tagName[0].toUpperCase()) {
|
if (el!.hasAttribute("t-component") || el!.tagName[0] === el!.tagName[0].toUpperCase()) {
|
||||||
isInSubComponent = true;
|
isInSubComponent = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
el = el.parentElement!;
|
el = el.parentElement!;
|
||||||
}
|
}
|
||||||
if (isInSubComponent) {
|
if (isInSubComponent || !el) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -972,40 +973,3 @@ function normalizeXML(el: Element) {
|
|||||||
normalizeTIf(el);
|
normalizeTIf(el);
|
||||||
normalizeTEscTOut(el);
|
normalizeTEscTOut(el);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Parses an XML string into an XML document, throwing errors on parser errors
|
|
||||||
* instead of returning an XML document containing the parseerror.
|
|
||||||
*
|
|
||||||
* @param xml the string to parse
|
|
||||||
* @returns an XML document corresponding to the content of the string
|
|
||||||
*/
|
|
||||||
function parseXML(xml: string): XMLDocument {
|
|
||||||
const parser = new DOMParser();
|
|
||||||
const doc = parser.parseFromString(xml, "text/xml");
|
|
||||||
if (doc.getElementsByTagName("parsererror").length) {
|
|
||||||
let msg = "Invalid XML in template.";
|
|
||||||
const parsererrorText = doc.getElementsByTagName("parsererror")[0].textContent;
|
|
||||||
if (parsererrorText) {
|
|
||||||
msg += "\nThe parser has produced the following error message:\n" + parsererrorText;
|
|
||||||
const re = /\d+/g;
|
|
||||||
const firstMatch = re.exec(parsererrorText);
|
|
||||||
if (firstMatch) {
|
|
||||||
const lineNumber = Number(firstMatch[0]);
|
|
||||||
const line = xml.split("\n")[lineNumber - 1];
|
|
||||||
const secondMatch = re.exec(parsererrorText);
|
|
||||||
if (line && secondMatch) {
|
|
||||||
const columnIndex = Number(secondMatch[0]) - 1;
|
|
||||||
if (line[columnIndex]) {
|
|
||||||
msg +=
|
|
||||||
`\nThe error might be located at xml line ${lineNumber} column ${columnIndex}\n` +
|
|
||||||
`${line}\n${"-".repeat(columnIndex - 1)}^`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new OwlError(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
return doc;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export type ComponentConstructor<P extends Props = any, E = any> = (new (
|
|||||||
|
|
||||||
export class Component<Props = any, Env = any> {
|
export class Component<Props = any, Env = any> {
|
||||||
static template: string = "";
|
static template: string = "";
|
||||||
static props?: any;
|
static props?: Schema;
|
||||||
static defaultProps?: any;
|
static defaultProps?: any;
|
||||||
|
|
||||||
props: Props;
|
props: Props;
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export function useChildSubEnv(envExtension: Env) {
|
|||||||
// useEffect
|
// useEffect
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
type EffectDeps<T extends any[]> = T | (T extends [...infer H, never] ? EffectDeps<H> : never);
|
type EffectDeps<T extends unknown[]> = T | (T extends [...infer H, never] ? EffectDeps<H> : never);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @template T
|
* @template T
|
||||||
@@ -67,7 +67,7 @@ type EffectDeps<T extends any[]> = T | (T extends [...infer H, never] ? EffectDe
|
|||||||
* @returns {void|(()=>void)} a cleanup function that reverses the side
|
* @returns {void|(()=>void)} a cleanup function that reverses the side
|
||||||
* effects of the effect callback.
|
* effects of the effect callback.
|
||||||
*/
|
*/
|
||||||
type Effect<T extends [...T]> = (...dependencies: EffectDeps<T>) => void | (() => void);
|
type Effect<T extends unknown[]> = (...dependencies: EffectDeps<T>) => void | (() => void);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This hook will run a callback when a component is mounted and patched, and
|
* This hook will run a callback when a component is mounted and patched, and
|
||||||
@@ -76,15 +76,15 @@ type Effect<T extends [...T]> = (...dependencies: EffectDeps<T>) => void | (() =
|
|||||||
*
|
*
|
||||||
* @template T
|
* @template T
|
||||||
* @param {Effect<T>} effect the effect to run on component mount and/or patch
|
* @param {Effect<T>} effect the effect to run on component mount and/or patch
|
||||||
* @param {()=>T} [computeDependencies=()=>[NaN]] a callback to compute
|
* @param {()=>[...T]} [computeDependencies=()=>[NaN]] a callback to compute
|
||||||
* dependencies that will decide if the effect needs to be cleaned up and
|
* dependencies that will decide if the effect needs to be cleaned up and
|
||||||
* run again. If the dependencies did not change, the effect will not run
|
* run again. If the dependencies did not change, the effect will not run
|
||||||
* again. The default value returns an array containing only NaN because
|
* again. The default value returns an array containing only NaN because
|
||||||
* NaN !== NaN, which will cause the effect to rerun on every patch.
|
* NaN !== NaN, which will cause the effect to rerun on every patch.
|
||||||
*/
|
*/
|
||||||
export function useEffect<T extends [...T]>(
|
export function useEffect<T extends unknown[]>(
|
||||||
effect: Effect<T>,
|
effect: Effect<T>,
|
||||||
computeDependencies: () => T = () => [NaN] as never
|
computeDependencies: () => [...T] = () => [NaN] as never
|
||||||
) {
|
) {
|
||||||
let cleanup: (() => void) | void;
|
let cleanup: (() => void) | void;
|
||||||
let dependencies: T;
|
let dependencies: T;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export { useComponent, useState } from "./component_node";
|
|||||||
export { status } from "./status";
|
export { status } from "./status";
|
||||||
export { reactive, markRaw, toRaw } from "./reactivity";
|
export { reactive, markRaw, toRaw } from "./reactivity";
|
||||||
export { useEffect, useEnv, useExternalListener, useRef, useChildSubEnv, useSubEnv } from "./hooks";
|
export { useEffect, useEnv, useExternalListener, useRef, useChildSubEnv, useSubEnv } from "./hooks";
|
||||||
export { EventBus, whenReady, loadFile, markup } from "./utils";
|
export { batched, EventBus, whenReady, loadFile, markup } from "./utils";
|
||||||
export {
|
export {
|
||||||
onWillStart,
|
onWillStart,
|
||||||
onMounted,
|
onMounted,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ function wrapError(fn: (...args: any[]) => any, hookName: string) {
|
|||||||
result.catch(() => {}),
|
result.catch(() => {}),
|
||||||
new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
|
new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
|
||||||
]).then((res) => {
|
]).then((res) => {
|
||||||
if (res === TIMEOUT && node.fiber === fiber) {
|
if (res === TIMEOUT && node.fiber === fiber && node.status <= 2) {
|
||||||
console.warn(timeoutError);
|
console.warn(timeoutError);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export class Portal extends Component {
|
|||||||
type: String,
|
type: String,
|
||||||
},
|
},
|
||||||
slots: true,
|
slots: true,
|
||||||
};
|
} as const;
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
const node: any = this.__owl__;
|
const node: any = this.__owl__;
|
||||||
|
|||||||
@@ -20,8 +20,9 @@ type CollectionRawType = "Set" | "Map" | "WeakMap";
|
|||||||
const objectToString = Object.prototype.toString;
|
const objectToString = Object.prototype.toString;
|
||||||
const objectHasOwnProperty = Object.prototype.hasOwnProperty;
|
const objectHasOwnProperty = Object.prototype.hasOwnProperty;
|
||||||
|
|
||||||
const SUPPORTED_RAW_TYPES = new Set(["Object", "Array", "Set", "Map", "WeakMap"]);
|
// Use arrays because Array.includes is faster than Set.has for small arrays
|
||||||
const COLLECTION_RAWTYPES = new Set(["Set", "Map", "WeakMap"]);
|
const SUPPORTED_RAW_TYPES = ["Object", "Array", "Set", "Map", "WeakMap"];
|
||||||
|
const COLLECTION_RAW_TYPES = ["Set", "Map", "WeakMap"];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* extract "RawType" from strings like "[object RawType]" => this lets us ignore
|
* extract "RawType" from strings like "[object RawType]" => this lets us ignore
|
||||||
@@ -45,7 +46,7 @@ function canBeMadeReactive(value: any): boolean {
|
|||||||
if (typeof value !== "object") {
|
if (typeof value !== "object") {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return SUPPORTED_RAW_TYPES.has(rawType(value));
|
return SUPPORTED_RAW_TYPES.includes(rawType(value));
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Creates a reactive from the given object/callback if possible and returns it,
|
* Creates a reactive from the given object/callback if possible and returns it,
|
||||||
@@ -220,7 +221,7 @@ export function reactive<T extends Target>(target: T, callback: Callback = NO_CA
|
|||||||
const reactivesForTarget = reactiveCache.get(target)!;
|
const reactivesForTarget = reactiveCache.get(target)!;
|
||||||
if (!reactivesForTarget.has(callback)) {
|
if (!reactivesForTarget.has(callback)) {
|
||||||
const targetRawType = rawType(target);
|
const targetRawType = rawType(target);
|
||||||
const handler = COLLECTION_RAWTYPES.has(targetRawType)
|
const handler = COLLECTION_RAW_TYPES.includes(targetRawType)
|
||||||
? collectionsProxyHandler(target as Collection, callback, targetRawType as CollectionRawType)
|
? collectionsProxyHandler(target as Collection, callback, targetRawType as CollectionRawType)
|
||||||
: basicProxyHandler<T>(callback);
|
: basicProxyHandler<T>(callback);
|
||||||
const proxy = new Proxy(target, handler as ProxyHandler<T>) as Reactive<T>;
|
const proxy = new Proxy(target, handler as ProxyHandler<T>) as Reactive<T>;
|
||||||
@@ -249,7 +250,7 @@ function basicProxyHandler<T extends Target>(callback: Callback): ProxyHandler<T
|
|||||||
set(target, key, value, receiver) {
|
set(target, key, value, receiver) {
|
||||||
const hadKey = objectHasOwnProperty.call(target, key);
|
const hadKey = objectHasOwnProperty.call(target, key);
|
||||||
const originalValue = Reflect.get(target, key, receiver);
|
const originalValue = Reflect.get(target, key, receiver);
|
||||||
const ret = Reflect.set(target, key, value, receiver);
|
const ret = Reflect.set(target, key, toRaw(value), receiver);
|
||||||
if (!hadKey && objectHasOwnProperty.call(target, key)) {
|
if (!hadKey && objectHasOwnProperty.call(target, key)) {
|
||||||
notifyReactives(target, KEYCHANGES);
|
notifyReactives(target, KEYCHANGES);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,44 +4,16 @@ import { getCurrent } from "./component_node";
|
|||||||
import { Portal, portalTemplate } from "./portal";
|
import { Portal, portalTemplate } from "./portal";
|
||||||
import { helpers } from "./template_helpers";
|
import { helpers } from "./template_helpers";
|
||||||
import { OwlError } from "../common/owl_error";
|
import { OwlError } from "../common/owl_error";
|
||||||
|
import { parseXML } from "../common/utils";
|
||||||
|
|
||||||
const bdom = { text, createBlock, list, multi, html, toggler, comment };
|
const bdom = { text, createBlock, list, multi, html, toggler, comment };
|
||||||
|
|
||||||
function parseXML(xml: string): Document {
|
|
||||||
const parser = new DOMParser();
|
|
||||||
|
|
||||||
const doc = parser.parseFromString(xml, "text/xml");
|
|
||||||
if (doc.getElementsByTagName("parsererror").length) {
|
|
||||||
let msg = "Invalid XML in template.";
|
|
||||||
const parsererrorText = doc.getElementsByTagName("parsererror")[0].textContent;
|
|
||||||
if (parsererrorText) {
|
|
||||||
msg += "\nThe parser has produced the following error message:\n" + parsererrorText;
|
|
||||||
const re = /\d+/g;
|
|
||||||
const firstMatch = re.exec(parsererrorText);
|
|
||||||
if (firstMatch) {
|
|
||||||
const lineNumber = Number(firstMatch[0]);
|
|
||||||
const line = xml.split("\n")[lineNumber - 1];
|
|
||||||
const secondMatch = re.exec(parsererrorText);
|
|
||||||
if (line && secondMatch) {
|
|
||||||
const columnIndex = Number(secondMatch[0]) - 1;
|
|
||||||
if (line[columnIndex]) {
|
|
||||||
msg +=
|
|
||||||
`\nThe error might be located at xml line ${lineNumber} column ${columnIndex}\n` +
|
|
||||||
`${line}\n${"-".repeat(columnIndex - 1)}^`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new OwlError(msg);
|
|
||||||
}
|
|
||||||
return doc;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TemplateSetConfig {
|
export interface TemplateSetConfig {
|
||||||
dev?: boolean;
|
dev?: boolean;
|
||||||
translatableAttributes?: string[];
|
translatableAttributes?: string[];
|
||||||
translateFn?: (s: string) => string;
|
translateFn?: (s: string) => string;
|
||||||
templates?: string | Document;
|
templates?: string | Document | Record<string, string>;
|
||||||
|
getTemplate?: (s: string) => Element | Function | string | void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TemplateSet {
|
export class TemplateSet {
|
||||||
@@ -51,6 +23,7 @@ export class TemplateSet {
|
|||||||
dev: boolean;
|
dev: boolean;
|
||||||
rawTemplates: typeof globalTemplates = Object.create(globalTemplates);
|
rawTemplates: typeof globalTemplates = Object.create(globalTemplates);
|
||||||
templates: { [name: string]: Template } = {};
|
templates: { [name: string]: Template } = {};
|
||||||
|
getRawTemplate?: (s: string) => Element | Function | string | void;
|
||||||
translateFn?: (s: string) => string;
|
translateFn?: (s: string) => string;
|
||||||
translatableAttributes?: string[];
|
translatableAttributes?: string[];
|
||||||
Portal = Portal;
|
Portal = Portal;
|
||||||
@@ -60,8 +33,15 @@ export class TemplateSet {
|
|||||||
this.translateFn = config.translateFn;
|
this.translateFn = config.translateFn;
|
||||||
this.translatableAttributes = config.translatableAttributes;
|
this.translatableAttributes = config.translatableAttributes;
|
||||||
if (config.templates) {
|
if (config.templates) {
|
||||||
this.addTemplates(config.templates);
|
if (config.templates instanceof Document || typeof config.templates === "string") {
|
||||||
|
this.addTemplates(config.templates);
|
||||||
|
} else {
|
||||||
|
for (const name in config.templates) {
|
||||||
|
this.addTemplate(name, config.templates[name]);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
this.getRawTemplate = config.getTemplate;
|
||||||
}
|
}
|
||||||
|
|
||||||
addTemplate(name: string, template: string | Element) {
|
addTemplate(name: string, template: string | Element) {
|
||||||
@@ -100,7 +80,7 @@ export class TemplateSet {
|
|||||||
|
|
||||||
getTemplate(name: string): Template {
|
getTemplate(name: string): Template {
|
||||||
if (!(name in this.templates)) {
|
if (!(name in this.templates)) {
|
||||||
const rawTemplate = this.rawTemplates[name];
|
const rawTemplate = this.getRawTemplate?.(name) || this.rawTemplates[name];
|
||||||
if (rawTemplate === undefined) {
|
if (rawTemplate === undefined) {
|
||||||
let extraInfo = "";
|
let extraInfo = "";
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,15 +1,7 @@
|
|||||||
import { OwlError } from "../common/owl_error";
|
import { OwlError } from "../common/owl_error";
|
||||||
import { toRaw } from "./reactivity";
|
import { toRaw } from "./reactivity";
|
||||||
|
|
||||||
type BaseType =
|
type BaseType = { new (...args: any[]): any } | true | "*";
|
||||||
| typeof String
|
|
||||||
| typeof Boolean
|
|
||||||
| typeof Number
|
|
||||||
| typeof Date
|
|
||||||
| typeof Object
|
|
||||||
| typeof Array
|
|
||||||
| true
|
|
||||||
| "*";
|
|
||||||
|
|
||||||
interface TypeInfo {
|
interface TypeInfo {
|
||||||
type?: TypeDescription;
|
type?: TypeDescription;
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
// do not modify manually. This file is generated by the release script.
|
// do not modify manually. This file is generated by the release script.
|
||||||
export const version = "2.2.6";
|
export const version = "2.3.0";
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ exports[`app app: clear scheduler tasks and destroy cancelled nodes immediately
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`app app: clear scheduler tasks and destroy cancelled nodes immediately on destroy 2`] = `
|
exports[`app app: clear scheduler tasks and destroy cancelled nodes immediately on destroy 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -57,6 +57,19 @@ exports[`app can configure an app with props 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`app can load templates from an object name-string 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div class=\\"hello\\">hello</div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`app can mount app in an iframe 1`] = `
|
exports[`app can mount app in an iframe 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
makeDeferred,
|
makeDeferred,
|
||||||
nextMicroTick,
|
nextMicroTick,
|
||||||
|
steps,
|
||||||
} from "../helpers";
|
} from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
@@ -123,23 +124,64 @@ describe("app", () => {
|
|||||||
|
|
||||||
const app = new App(A);
|
const app = new App(A);
|
||||||
const comp = await app.mount(fixture);
|
const comp = await app.mount(fixture);
|
||||||
expect(["A:setup", "A:willStart", "A:willRender", "A:rendered", "A:mounted"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"A:setup",
|
||||||
|
"A:willStart",
|
||||||
|
"A:willRender",
|
||||||
|
"A:rendered",
|
||||||
|
"A:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
comp.state.value = true;
|
comp.state.value = true;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["A:willRender", "B:setup", "B:willStart", "A:rendered"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
// rerender to force the instantiation of a new B component (and cancelling the first)
|
// rerender to force the instantiation of a new B component (and cancelling the first)
|
||||||
comp.render();
|
comp.render();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
expect(["A:willRender", "B:setup", "B:willStart", "A:rendered"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
app.destroy();
|
app.destroy();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"A:willUnmount",
|
Array [
|
||||||
"B:willDestroy",
|
"A:willUnmount",
|
||||||
"A:willDestroy",
|
"B:willDestroy",
|
||||||
"B:willDestroy", // make sure the 2 B instances have been destroyed synchronously
|
"A:willDestroy",
|
||||||
]).toBeLogged();
|
"B:willDestroy",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("can load templates from an object name-string", async () => {
|
||||||
|
const templates = {
|
||||||
|
hello: `<div class="hello">hello</div>`,
|
||||||
|
world: `<div>world</div>`,
|
||||||
|
};
|
||||||
|
class SomeComponent extends Component {
|
||||||
|
static template = "hello";
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = new App(SomeComponent, { templates });
|
||||||
|
await app.mount(fixture);
|
||||||
|
expect(fixture.querySelector(".hello")).toBeDefined();
|
||||||
|
// Only the "hello" template is used, so the "world" template is not yet loaded
|
||||||
|
expect(Object.keys(app.templates)).toEqual(["hello"]);
|
||||||
|
expect(Object.keys(app.rawTemplates)).toEqual(["hello", "world"]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,38 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`comments comment node with backslash at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return comment(\` \\\\\\\\ \`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`comments comment node with backtick at top-level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return comment(\` \\\\\` \`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`comments comment node with interpolation sigil at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return comment(\` \\\\\${very cool} \`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`comments only a comment 1`] = `
|
exports[`comments only a comment 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -341,6 +341,39 @@ exports[`simple templates, mostly static template with t tag with multiple conte
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`simple templates, mostly static text node with backslash at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(\`\\\\\\\\\`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`simple templates, mostly static text node with backtick at top-level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(\`\\\\\`\`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`simple templates, mostly static text node with interpolation sigil at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(\`\\\\\${very cool}\`);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`simple templates, mostly static two t-escs next to each other 1`] = `
|
exports[`simple templates, mostly static two t-escs next to each other 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -1,5 +1,41 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`t-esc default with backslash at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { withDefault } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(withDefault(undefined, \`\\\\\\\\\`));
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`t-esc default with backtick at top-level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { withDefault } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(withDefault(undefined, \`\\\\\`\`));
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`t-esc default with interpolation sigil at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { withDefault } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(withDefault(undefined, \`\\\\\${very cool}\`));
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`t-esc div with falsy values 1`] = `
|
exports[`t-esc div with falsy values 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -1,5 +1,50 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`t-set body with backslash at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { isBoundary, withDefault, setContextValue } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
ctx = Object.create(ctx);
|
||||||
|
ctx[isBoundary] = 1
|
||||||
|
setContextValue(ctx, \\"value\\", \`\\\\\\\\\`);
|
||||||
|
return text(ctx['value']);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`t-set body with backtick at top-level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { isBoundary, withDefault, setContextValue } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
ctx = Object.create(ctx);
|
||||||
|
ctx[isBoundary] = 1
|
||||||
|
setContextValue(ctx, \\"value\\", \`\\\\\`\`);
|
||||||
|
return text(ctx['value']);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`t-set body with interpolation sigil at top level 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { isBoundary, withDefault, setContextValue } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
ctx = Object.create(ctx);
|
||||||
|
ctx[isBoundary] = 1
|
||||||
|
setContextValue(ctx, \\"value\\", \`\\\\\${very cool}\`);
|
||||||
|
return text(ctx['value']);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`t-set evaluate value expression 1`] = `
|
exports[`t-set evaluate value expression 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -101,3 +101,55 @@ exports[`loading templates can load a few templates from an XMLDocument 2`] = `
|
|||||||
}
|
}
|
||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`loading templates getTemplate: element returned (2) 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div>Hello World!</div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`loading templates getTemplate: element returned 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div>Hello World!</div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`loading templates getTemplate: template string returned 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div>Hello World!</div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`loading templates getTemplate: undefined returned 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div>Hello World!</div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|||||||
@@ -26,4 +26,19 @@ describe("comments", () => {
|
|||||||
</div>`;
|
</div>`;
|
||||||
expect(renderToString(template)).toBe("<div><span>true</span></div>");
|
expect(renderToString(template)).toBe("<div><span>true</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("comment node with backslash at top level", () => {
|
||||||
|
const template = "<!-- \\ -->";
|
||||||
|
expect(renderToString(template)).toBe("<!-- \\ -->");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("comment node with backtick at top-level", () => {
|
||||||
|
const template = "<!-- ` -->";
|
||||||
|
expect(renderToString(template)).toBe("<!-- ` -->");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("comment node with interpolation sigil at top level", () => {
|
||||||
|
const template = "<!-- ${very cool} -->";
|
||||||
|
expect(renderToString(template)).toBe("<!-- ${very cool} -->");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -174,6 +174,9 @@ describe("expression evaluation", () => {
|
|||||||
expect(compileExpr("list.data.map((data) => data)")).toBe(
|
expect(compileExpr("list.data.map((data) => data)")).toBe(
|
||||||
"ctx['list'].data.map((_data)=>_data)"
|
"ctx['list'].data.map((_data)=>_data)"
|
||||||
);
|
);
|
||||||
|
expect(compileExpr("(ev) => { myFunc(v1, v2, ev.target.value); }")).toBe(
|
||||||
|
"(_ev)=>{ctx['myFunc'](ctx['v1'],ctx['v2'],_ev.target.value);}"
|
||||||
|
);
|
||||||
});
|
});
|
||||||
test.skip("arrow functions: not yet supported", () => {
|
test.skip("arrow functions: not yet supported", () => {
|
||||||
// e is added to localvars in inline_expression but not removed after the arrow func body
|
// e is added to localvars in inline_expression but not removed after the arrow func body
|
||||||
|
|||||||
@@ -154,4 +154,19 @@ describe("simple templates, mostly static", () => {
|
|||||||
</div>`;
|
</div>`;
|
||||||
expect(renderToString(template, { a: "a", b: "b", c: "c" })).toBe("<div>abLoadingc</div>");
|
expect(renderToString(template, { a: "a", b: "b", c: "c" })).toBe("<div>abLoadingc</div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("text node with backslash at top level", () => {
|
||||||
|
const template = "\\";
|
||||||
|
expect(renderToString(template)).toBe("\\");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("text node with backtick at top-level", () => {
|
||||||
|
const template = "`";
|
||||||
|
expect(renderToString(template)).toBe("`");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("text node with interpolation sigil at top level", () => {
|
||||||
|
const template = "${very cool}";
|
||||||
|
expect(renderToString(template)).toBe("${very cool}");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -121,4 +121,19 @@ describe("t-esc", () => {
|
|||||||
mount(bdom, fixture);
|
mount(bdom, fixture);
|
||||||
expect(fixture.querySelector("span")!.textContent).toBe("<p>escaped</p>");
|
expect(fixture.querySelector("span")!.textContent).toBe("<p>escaped</p>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("default with backslash at top level", () => {
|
||||||
|
const template = '<t t-esc="undefined">\\</t>';
|
||||||
|
expect(renderToString(template)).toBe("\\");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("default with backtick at top-level", () => {
|
||||||
|
const template = '<t t-esc="undefined">`</t>';
|
||||||
|
expect(renderToString(template)).toBe("`");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("default with interpolation sigil at top level", () => {
|
||||||
|
const template = '<t t-esc="undefined">${very cool}</t>';
|
||||||
|
expect(renderToString(template)).toBe("${very cool}");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -54,6 +54,21 @@ describe("t-set", () => {
|
|||||||
expect(renderToString(template)).toBe("ok");
|
expect(renderToString(template)).toBe("ok");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("body with backslash at top level", () => {
|
||||||
|
const template = '<t t-set="value">\\</t><t t-esc="value"/>';
|
||||||
|
expect(renderToString(template)).toBe("\\");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("body with backtick at top-level", () => {
|
||||||
|
const template = '<t t-set="value">`</t><t t-esc="value"/>';
|
||||||
|
expect(renderToString(template)).toBe("`");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("body with interpolation sigil at top level", () => {
|
||||||
|
const template = '<t t-set="value">${very cool}</t><t t-esc="value"/>';
|
||||||
|
expect(renderToString(template)).toBe("${very cool}");
|
||||||
|
});
|
||||||
|
|
||||||
test("set from body literal (with t-if/t-else", () => {
|
test("set from body literal (with t-if/t-else", () => {
|
||||||
const template = `
|
const template = `
|
||||||
<t>
|
<t>
|
||||||
|
|||||||
@@ -78,4 +78,62 @@ describe("loading templates", () => {
|
|||||||
context.addTemplates(xml);
|
context.addTemplates(xml);
|
||||||
expect(Object.keys(context.rawTemplates)).toEqual([]);
|
expect(Object.keys(context.rawTemplates)).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("getTemplate: element returned", () => {
|
||||||
|
const context = new TestContext({
|
||||||
|
getTemplate: (name) => {
|
||||||
|
if (name === "main") {
|
||||||
|
const data = `<div>Hello World!</div>`;
|
||||||
|
const xml = new DOMParser().parseFromString(data, "text/xml");
|
||||||
|
return xml.firstChild as Element;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const result = context.renderToString("main");
|
||||||
|
expect(result).toBe("<div>Hello World!</div>");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getTemplate: element returned (2)", () => {
|
||||||
|
const context = new TestContext({
|
||||||
|
getTemplate: (name) => {
|
||||||
|
if (name === "main") {
|
||||||
|
const doc = new Document();
|
||||||
|
const div = doc.createElement("div");
|
||||||
|
div.append(doc.createTextNode("Hello World!"));
|
||||||
|
return div;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const result = context.renderToString("main");
|
||||||
|
expect(result).toBe("<div>Hello World!</div>");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getTemplate: template string returned", () => {
|
||||||
|
const context = new TestContext({
|
||||||
|
getTemplate: (name) => {
|
||||||
|
if (name === "main") {
|
||||||
|
return `<div>Hello World!</div>`;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const result = context.renderToString("main");
|
||||||
|
expect(result).toBe("<div>Hello World!</div>");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getTemplate: undefined returned", () => {
|
||||||
|
const context = new TestContext({
|
||||||
|
getTemplate: () => {},
|
||||||
|
});
|
||||||
|
const data = `<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<templates id="template" xml:space="preserve">
|
||||||
|
<div t-name="main">Hello World!</div>
|
||||||
|
</templates>`;
|
||||||
|
const xml = new DOMParser().parseFromString(data, "text/xml");
|
||||||
|
context.addTemplates(xml);
|
||||||
|
const result = context.renderToString("main");
|
||||||
|
expect(result).toBe("<div>Hello World!</div>");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ exports[`changing state before first render does not trigger a render (with pare
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`changing state before first render does not trigger a render (with parent) 2`] = `
|
exports[`changing state before first render does not trigger a render (with parent) 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -254,7 +254,7 @@ exports[`components are not destroyed between animation frame 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`components are not destroyed between animation frame 2`] = `
|
exports[`components are not destroyed between animation frame 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -268,7 +268,7 @@ exports[`components are not destroyed between animation frame 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`components are not destroyed between animation frame 3`] = `
|
exports[`components are not destroyed between animation frame 5`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -748,7 +748,7 @@ exports[`concurrent renderings scenario 10 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`concurrent renderings scenario 10 3`] = `
|
exports[`concurrent renderings scenario 10 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -993,7 +993,7 @@ exports[`concurrent renderings scenario 16 3`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`concurrent renderings scenario 16 4`] = `
|
exports[`concurrent renderings scenario 16 6`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1024,7 +1024,7 @@ exports[`creating two async components, scenario 1 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`creating two async components, scenario 1 2`] = `
|
exports[`creating two async components, scenario 1 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1038,7 +1038,7 @@ exports[`creating two async components, scenario 1 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`creating two async components, scenario 1 3`] = `
|
exports[`creating two async components, scenario 1 5`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1085,7 +1085,7 @@ exports[`creating two async components, scenario 2 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`creating two async components, scenario 2 3`] = `
|
exports[`creating two async components, scenario 2 5`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1133,7 +1133,7 @@ exports[`creating two async components, scenario 3 (patching in the same frame)
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`creating two async components, scenario 3 (patching in the same frame) 3`] = `
|
exports[`creating two async components, scenario 3 (patching in the same frame) 5`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1308,7 +1308,7 @@ exports[`delayed render does not go through when t-component value changed 2`] =
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`delayed render does not go through when t-component value changed 3`] = `
|
exports[`delayed render does not go through when t-component value changed 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1617,7 +1617,7 @@ exports[`destroyed component causes other soon to be destroyed component to rere
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 2`] = `
|
exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1628,7 +1628,7 @@ exports[`destroyed component causes other soon to be destroyed component to rere
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 3`] = `
|
exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1656,7 +1656,7 @@ exports[`destroying/recreating a subcomponent, other scenario 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`destroying/recreating a subcomponent, other scenario 2`] = `
|
exports[`destroying/recreating a subcomponent, other scenario 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1685,7 +1685,7 @@ exports[`destroying/recreating a subwidget with different props (if start is not
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`destroying/recreating a subwidget with different props (if start is not over) 2`] = `
|
exports[`destroying/recreating a subwidget with different props (if start is not over) 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -1787,7 +1787,7 @@ exports[`rendering component again in next microtick 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`rendering component again in next microtick 2`] = `
|
exports[`rendering component again in next microtick 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ exports[`can catch errors an error in onWillDestroy, variation 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`can catch errors an error in onWillDestroy, variation 2`] = `
|
exports[`can catch errors an error in onWillDestroy, variation 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ exports[`lifecycle hooks component semantics 5`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks component semantics 6`] = `
|
exports[`lifecycle hooks component semantics 7`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -185,7 +185,7 @@ exports[`lifecycle hooks destroy new children before being mountged 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks destroy new children before being mountged 2`] = `
|
exports[`lifecycle hooks destroy new children before being mountged 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -291,7 +291,7 @@ exports[`lifecycle hooks lifecycle semantics, part 2 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks lifecycle semantics, part 2 2`] = `
|
exports[`lifecycle hooks lifecycle semantics, part 2 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -303,7 +303,7 @@ exports[`lifecycle hooks lifecycle semantics, part 2 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks lifecycle semantics, part 2 3`] = `
|
exports[`lifecycle hooks lifecycle semantics, part 2 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -348,7 +348,7 @@ exports[`lifecycle hooks lifecycle semantics, part 4 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks lifecycle semantics, part 4 2`] = `
|
exports[`lifecycle hooks lifecycle semantics, part 4 3`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -360,7 +360,7 @@ exports[`lifecycle hooks lifecycle semantics, part 4 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks lifecycle semantics, part 4 3`] = `
|
exports[`lifecycle hooks lifecycle semantics, part 4 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
@@ -683,6 +683,19 @@ exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly calle
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`lifecycle hooks timeout in onWillStart doesn't emit a warning if app is destroyed 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<span/>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return block1();
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`lifecycle hooks timeout in onWillStart emits a warning 1`] = `
|
exports[`lifecycle hooks timeout in onWillStart emits a warning 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -66,6 +66,29 @@ exports[`.alike suffix in a simple case 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`.translate props are translated 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, false, false, []);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return comp1({message: \`translated message\`}, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`.translate props are translated 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].message);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`basics accept ES6-like syntax for props (with getters) 1`] = `
|
exports[`basics accept ES6-like syntax for props (with getters) 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
@@ -412,6 +435,29 @@ exports[`can bind function prop with bind suffix 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`can use .translate suffix 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, false, false, []);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return comp1({message: \`some message\`}, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`can use .translate suffix 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].message);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`do not crash when binding anonymous function prop with bind suffix 1`] = `
|
exports[`do not crash when binding anonymous function prop with bind suffix 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -167,6 +167,45 @@ exports[`props validation can specify that additional props are allowed (object)
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`props validation can use custom class as type 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, false, false, [\\"customObj\\"]);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const props1 = {customObj: ctx['customObj']};
|
||||||
|
helpers.validateProps(\`Child\`, props1, this);
|
||||||
|
return comp1(props1, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`props validation can use custom class as type 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].customObj.val);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`props validation can use custom class as type: validation failure 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, false, false, [\\"customObj\\"]);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const props1 = {customObj: ctx['customObj']};
|
||||||
|
helpers.validateProps(\`Child\`, props1, this);
|
||||||
|
return comp1(props1, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`props validation can validate a prop with multiple types 1`] = `
|
exports[`props validation can validate a prop with multiple types 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -1,5 +1,30 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`slots .translate slot props are translated 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { capture, markRaw } = helpers;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, true, false, []);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const ctx1 = capture(ctx);
|
||||||
|
return comp1({slots: markRaw({'default': {message: \`translated message\`}})}, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`slots .translate slot props are translated 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].slots.default.message);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`slots can define a default content 1`] = `
|
exports[`slots can define a default content 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
@@ -201,6 +226,31 @@ exports[`slots can render only empty slot 1`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`slots can use .translate suffix on slot props 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { capture, markRaw } = helpers;
|
||||||
|
const comp1 = app.createComponent(\`Child\`, true, true, false, []);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const ctx1 = capture(ctx);
|
||||||
|
return comp1({slots: markRaw({'default': {message: \`some message\`}})}, key + \`__1\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`slots can use .translate suffix on slot props 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].slots.default.message);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`slots can use component in default-content of t-slot 1`] = `
|
exports[`slots can use component in default-content of t-slot 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
@@ -1066,6 +1116,45 @@ exports[`slots multiple slots containing components 3`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`slots named slot inside named slot in t-component 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { capture, markRaw } = helpers;
|
||||||
|
const comp1 = app.createComponent(null, false, true, false, []);
|
||||||
|
const comp2 = app.createComponent(\`Child\`, true, true, false, []);
|
||||||
|
|
||||||
|
function slot1(ctx, node, key = \\"\\") {
|
||||||
|
const b2 = text(\` outer \`);
|
||||||
|
const ctx2 = capture(ctx);
|
||||||
|
const Comp1 = ctx['Child'];
|
||||||
|
const b4 = toggler(Comp1, comp1({slots: markRaw({'brol': {__render: slot2.bind(this), __ctx: ctx2}})}, (Comp1).name + key + \`__1\`, node, this, Comp1));
|
||||||
|
return multi([b2, b4]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function slot2(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['value']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const ctx1 = capture(ctx);
|
||||||
|
return comp2({slots: markRaw({'brol': {__render: slot1.bind(this), __ctx: ctx1}})}, key + \`__2\`, node, this, null);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`slots named slot inside named slot in t-component 2`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { callSlot } = helpers;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return callSlot(ctx, node, key, 'brol', false, {});
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`slots named slot inside slot 1`] = `
|
exports[`slots named slot inside slot 1`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ exports[`t-component switching dynamic component 2`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`t-component switching dynamic component 3`] = `
|
exports[`t-component switching dynamic component 4`] = `
|
||||||
"function anonymous(app, bdom, helpers
|
"function anonymous(app, bdom, helpers
|
||||||
) {
|
) {
|
||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
|||||||
@@ -44,7 +44,26 @@ exports[`t-model directive .trim modifier 1`] = `
|
|||||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
let { toNumber } = helpers;
|
let { toNumber } = helpers;
|
||||||
|
|
||||||
let block1 = createBlock(\`<div><input block-property-0=\\"value\\" block-handler-1=\\"input\\"/><span><block-text-2/></span></div>\`);
|
let block1 = createBlock(\`<div><input block-property-0=\\"value\\" block-handler-1=\\"change\\"/><span><block-text-2/></span></div>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const bExpr1 = ctx['state'];
|
||||||
|
const expr1 = 'text';
|
||||||
|
let prop1 = bExpr1[expr1];
|
||||||
|
let hdlr1 = [(ev) => { bExpr1[expr1] = ev.target.value.trim(); }];
|
||||||
|
let txt1 = ctx['state'].text;
|
||||||
|
return block1([prop1, hdlr1, txt1]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`t-model directive .trim modifier implies .lazy modifier 1`] = `
|
||||||
|
"function anonymous(app, bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||||
|
let { toNumber } = helpers;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<div><input block-property-0=\\"value\\" block-handler-1=\\"change\\"/><span><block-text-2/></span></div>\`);
|
||||||
|
|
||||||
return function template(ctx, node, key = \\"\\") {
|
return function template(ctx, node, key = \\"\\") {
|
||||||
const bExpr1 = ctx['state'];
|
const bExpr1 = ctx['state'];
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
nextAppError,
|
nextAppError,
|
||||||
nextTick,
|
nextTick,
|
||||||
snapshotEverything,
|
snapshotEverything,
|
||||||
|
steps,
|
||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
} from "../helpers";
|
} from "../helpers";
|
||||||
import { markup } from "../../src/runtime/utils";
|
import { markup } from "../../src/runtime/utils";
|
||||||
@@ -868,19 +869,26 @@ describe("basics", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:setup",
|
Array [
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:willRender",
|
"Child:willStart",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
]).toBeLogged();
|
"Child:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.ifVar = false;
|
parent.ifVar = false;
|
||||||
parent.render();
|
parent.render();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(0);
|
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(0);
|
||||||
expect(["Child:willUnmount", "Child:willDestroy"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willUnmount",
|
||||||
|
"Child:willDestroy",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("component children doesn't leak (t-key case)", async () => {
|
test("component children doesn't leak (t-key case)", async () => {
|
||||||
@@ -899,27 +907,31 @@ describe("basics", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:setup",
|
Array [
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:willRender",
|
"Child:willStart",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
]).toBeLogged();
|
"Child:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.keyVar = 2;
|
parent.keyVar = 2;
|
||||||
parent.render();
|
parent.render();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
expect(Object.keys(parent.__owl__.children).length).toStrictEqual(1);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:setup",
|
Array [
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:willRender",
|
"Child:willStart",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willUnmount",
|
"Child:rendered",
|
||||||
"Child:willDestroy",
|
"Child:willUnmount",
|
||||||
"Child:mounted",
|
"Child:willDestroy",
|
||||||
]).toBeLogged();
|
"Child:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("GrandChild display is controlled by its GrandParent", async () => {
|
test("GrandChild display is controlled by its GrandParent", async () => {
|
||||||
@@ -943,20 +955,27 @@ describe("basics", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"GrandChild:setup",
|
Array [
|
||||||
"GrandChild:willStart",
|
"GrandChild:setup",
|
||||||
"GrandChild:willRender",
|
"GrandChild:willStart",
|
||||||
"GrandChild:rendered",
|
"GrandChild:willRender",
|
||||||
"GrandChild:mounted",
|
"GrandChild:rendered",
|
||||||
]).toBeLogged();
|
"GrandChild:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.displayGrandChild = false;
|
parent.displayGrandChild = false;
|
||||||
parent.render();
|
parent.render();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("");
|
expect(fixture.innerHTML).toBe("");
|
||||||
|
|
||||||
expect(["GrandChild:willUnmount", "GrandChild:willDestroy"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"GrandChild:willUnmount",
|
||||||
|
"GrandChild:willDestroy",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
snapshotEverything,
|
snapshotEverything,
|
||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
nextAppError,
|
nextAppError,
|
||||||
|
steps,
|
||||||
} from "../helpers";
|
} from "../helpers";
|
||||||
import { OwlError } from "../../src/common/owl_error";
|
import { OwlError } from "../../src/common/owl_error";
|
||||||
|
|
||||||
@@ -948,26 +949,28 @@ describe("can catch errors", () => {
|
|||||||
}
|
}
|
||||||
await mount(Root, fixture);
|
await mount(Root, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div><div>Error handled</div></div>");
|
expect(fixture.innerHTML).toBe("<div><div>Error handled</div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Root:setup",
|
Array [
|
||||||
"Root:willStart",
|
"Root:setup",
|
||||||
"Root:willRender",
|
"Root:willStart",
|
||||||
"ErrorBoundary:setup",
|
"Root:willRender",
|
||||||
"ErrorBoundary:willStart",
|
"ErrorBoundary:setup",
|
||||||
"Root:rendered",
|
"ErrorBoundary:willStart",
|
||||||
"ErrorBoundary:willRender",
|
"Root:rendered",
|
||||||
"ErrorComponent:setup",
|
"ErrorBoundary:willRender",
|
||||||
"ErrorComponent:willStart",
|
"ErrorComponent:setup",
|
||||||
"ErrorBoundary:rendered",
|
"ErrorComponent:willStart",
|
||||||
"ErrorComponent:willRender",
|
"ErrorBoundary:rendered",
|
||||||
"ErrorComponent:rendered",
|
"ErrorComponent:willRender",
|
||||||
"ErrorComponent:mounted",
|
"ErrorComponent:rendered",
|
||||||
"boom",
|
"ErrorComponent:mounted",
|
||||||
"ErrorBoundary:willRender",
|
"boom",
|
||||||
"ErrorBoundary:rendered",
|
"ErrorBoundary:willRender",
|
||||||
"ErrorBoundary:mounted",
|
"ErrorBoundary:rendered",
|
||||||
"Root:mounted",
|
"ErrorBoundary:mounted",
|
||||||
]).toBeLogged();
|
"Root:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(mockConsoleError).toBeCalledTimes(0);
|
expect(mockConsoleError).toBeCalledTimes(0);
|
||||||
expect(mockConsoleWarn).toBeCalledTimes(0);
|
expect(mockConsoleWarn).toBeCalledTimes(0);
|
||||||
});
|
});
|
||||||
@@ -998,21 +1001,23 @@ describe("can catch errors", () => {
|
|||||||
}
|
}
|
||||||
await mount(Root, fixture);
|
await mount(Root, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div>Error handled</div>");
|
expect(fixture.innerHTML).toBe("<div>Error handled</div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Root:setup",
|
Array [
|
||||||
"Root:willStart",
|
"Root:setup",
|
||||||
"Root:willRender",
|
"Root:willStart",
|
||||||
"ErrorComponent:setup",
|
"Root:willRender",
|
||||||
"ErrorComponent:willStart",
|
"ErrorComponent:setup",
|
||||||
"Root:rendered",
|
"ErrorComponent:willStart",
|
||||||
"ErrorComponent:willRender",
|
"Root:rendered",
|
||||||
"ErrorComponent:rendered",
|
"ErrorComponent:willRender",
|
||||||
"ErrorComponent:mounted",
|
"ErrorComponent:rendered",
|
||||||
"boom",
|
"ErrorComponent:mounted",
|
||||||
"Root:willRender",
|
"boom",
|
||||||
"Root:rendered",
|
"Root:willRender",
|
||||||
"Root:mounted",
|
"Root:rendered",
|
||||||
]).toBeLogged();
|
"Root:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(mockConsoleError).toBeCalledTimes(0);
|
expect(mockConsoleError).toBeCalledTimes(0);
|
||||||
expect(mockConsoleWarn).toBeCalledTimes(0);
|
expect(mockConsoleWarn).toBeCalledTimes(0);
|
||||||
});
|
});
|
||||||
@@ -1059,31 +1064,33 @@ describe("can catch errors", () => {
|
|||||||
}
|
}
|
||||||
await mount(A, fixture);
|
await mount(A, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div><div>Error handled</div></div>");
|
expect(fixture.innerHTML).toBe("<div><div>Error handled</div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"A:setup",
|
Array [
|
||||||
"A:willStart",
|
"A:setup",
|
||||||
"A:willRender",
|
"A:willStart",
|
||||||
"B:setup",
|
"A:willRender",
|
||||||
"B:willStart",
|
"B:setup",
|
||||||
"A:rendered",
|
"B:willStart",
|
||||||
"B:willRender",
|
"A:rendered",
|
||||||
"C:setup",
|
"B:willRender",
|
||||||
"C:willStart",
|
"C:setup",
|
||||||
"B:rendered",
|
"C:willStart",
|
||||||
"C:willRender",
|
"B:rendered",
|
||||||
"Boom:setup",
|
"C:willRender",
|
||||||
"Boom:willStart",
|
"Boom:setup",
|
||||||
"C:rendered",
|
"Boom:willStart",
|
||||||
"Boom:willRender",
|
"C:rendered",
|
||||||
"Boom:rendered",
|
"Boom:willRender",
|
||||||
"Boom:mounted",
|
"Boom:rendered",
|
||||||
"boom",
|
"Boom:mounted",
|
||||||
"C:willRender",
|
"boom",
|
||||||
"C:rendered",
|
"C:willRender",
|
||||||
"C:mounted",
|
"C:rendered",
|
||||||
"B:mounted",
|
"C:mounted",
|
||||||
"A:mounted",
|
"B:mounted",
|
||||||
]).toBeLogged();
|
"A:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(mockConsoleError).toBeCalledTimes(0);
|
expect(mockConsoleError).toBeCalledTimes(0);
|
||||||
expect(mockConsoleWarn).toBeCalledTimes(0);
|
expect(mockConsoleWarn).toBeCalledTimes(0);
|
||||||
});
|
});
|
||||||
@@ -1130,31 +1137,33 @@ describe("can catch errors", () => {
|
|||||||
}
|
}
|
||||||
await mount(Root, fixture);
|
await mount(Root, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div>OK<div>Error handled</div></div>");
|
expect(fixture.innerHTML).toBe("<div>OK<div>Error handled</div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Root:setup",
|
Array [
|
||||||
"Root:willStart",
|
"Root:setup",
|
||||||
"Root:willRender",
|
"Root:willStart",
|
||||||
"OK:setup",
|
"Root:willRender",
|
||||||
"OK:willStart",
|
"OK:setup",
|
||||||
"ErrorBoundary:setup",
|
"OK:willStart",
|
||||||
"ErrorBoundary:willStart",
|
"ErrorBoundary:setup",
|
||||||
"Root:rendered",
|
"ErrorBoundary:willStart",
|
||||||
"OK:willRender",
|
"Root:rendered",
|
||||||
"OK:rendered",
|
"OK:willRender",
|
||||||
"ErrorBoundary:willRender",
|
"OK:rendered",
|
||||||
"ErrorComponent:setup",
|
"ErrorBoundary:willRender",
|
||||||
"ErrorComponent:willStart",
|
"ErrorComponent:setup",
|
||||||
"ErrorBoundary:rendered",
|
"ErrorComponent:willStart",
|
||||||
"ErrorComponent:willRender",
|
"ErrorBoundary:rendered",
|
||||||
"ErrorComponent:rendered",
|
"ErrorComponent:willRender",
|
||||||
"ErrorComponent:mounted",
|
"ErrorComponent:rendered",
|
||||||
"boom",
|
"ErrorComponent:mounted",
|
||||||
"ErrorBoundary:willRender",
|
"boom",
|
||||||
"ErrorBoundary:rendered",
|
"ErrorBoundary:willRender",
|
||||||
"ErrorBoundary:mounted",
|
"ErrorBoundary:rendered",
|
||||||
"OK:mounted",
|
"ErrorBoundary:mounted",
|
||||||
"Root:mounted",
|
"OK:mounted",
|
||||||
]).toBeLogged();
|
"Root:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(mockConsoleError).toBeCalledTimes(0);
|
expect(mockConsoleError).toBeCalledTimes(0);
|
||||||
expect(mockConsoleWarn).toBeCalledTimes(0);
|
expect(mockConsoleWarn).toBeCalledTimes(0);
|
||||||
});
|
});
|
||||||
@@ -1481,35 +1490,39 @@ describe("can catch errors", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("1<div>abc</div>");
|
expect(fixture.innerHTML).toBe("1<div>abc</div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
parent.state.hasChild = false;
|
parent.state.hasChild = false;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Child:willUnmount",
|
"Parent:willPatch",
|
||||||
"Child:willDestroy",
|
"Child:willUnmount",
|
||||||
"Parent:patched",
|
"Child:willDestroy",
|
||||||
"Parent:willRender",
|
"Parent:patched",
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("2");
|
expect(fixture.innerHTML).toBe("2");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1542,13 +1555,15 @@ describe("can catch errors", () => {
|
|||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("1");
|
expect(fixture.innerHTML).toBe("1");
|
||||||
|
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:mounted",
|
"Parent:rendered",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.hasChild = true;
|
parent.state.hasChild = true;
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
@@ -1556,26 +1571,35 @@ describe("can catch errors", () => {
|
|||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
]).toBeLogged();
|
"Child:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
parent.state.hasChild = false;
|
parent.state.hasChild = false;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Child:willDestroy",
|
"Parent:rendered",
|
||||||
"Parent:willRender",
|
"Child:willDestroy",
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
]).toBeLogged();
|
"Parent:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("1");
|
expect(fixture.innerHTML).toBe("1");
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["Parent:willPatch", "Parent:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Parent:willPatch",
|
||||||
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("2");
|
expect(fixture.innerHTML).toBe("2");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -641,6 +641,56 @@ describe("hooks", () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("effect types are inferred from dependencies", async () => {
|
||||||
|
// @ts-ignore (declared but never used)
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
class MyComponent extends Component {
|
||||||
|
static template = xml`<div/>`;
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
useEffect(
|
||||||
|
(a, b) => {
|
||||||
|
expectType<number>(a);
|
||||||
|
expectType<string>(b);
|
||||||
|
},
|
||||||
|
() => [3, "hello"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("effect type allows an effect with partial dependencies parameters", async () => {
|
||||||
|
// @ts-ignore (declared but never used)
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
class MyComponent extends Component {
|
||||||
|
static template = xml`<div/>`;
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
useEffect(
|
||||||
|
(a) => {
|
||||||
|
expectType<number>(a);
|
||||||
|
},
|
||||||
|
() => [3, "hello"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("effect type allows an effect with no dependency parameter", async () => {
|
||||||
|
// @ts-ignore (declared but never used)
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
class MyComponent extends Component {
|
||||||
|
static template = xml`<div/>`;
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
useEffect(
|
||||||
|
() => {},
|
||||||
|
() => [3, "hello"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test("properly behaves when the effect function throws", async () => {
|
test("properly behaves when the effect function throws", async () => {
|
||||||
let originalconsoleError = console.error;
|
let originalconsoleError = console.error;
|
||||||
let originalconsoleWarn = console.warn;
|
let originalconsoleWarn = console.warn;
|
||||||
@@ -673,3 +723,5 @@ describe("hooks", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function expectType<T>(t: T) {}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Component, mount, onWillUpdateProps, useState, xml } from "../../src";
|
import { Component, mount, onWillUpdateProps, useState, xml } from "../../src";
|
||||||
import { makeTestFixture, nextTick, snapshotEverything, useLogLifecycle } from "../helpers";
|
import { makeTestFixture, nextTick, snapshotEverything, steps, useLogLifecycle } from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
|
|
||||||
@@ -272,29 +272,61 @@ test("bound functions are considered 'alike'", async () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("1child");
|
expect(fixture.innerHTML).toBe("1child");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
parent.state.val = 3;
|
parent.state.val = 3;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("3child");
|
expect(fixture.innerHTML).toBe("3child");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("can use .translate suffix", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-esc="props.message"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`<Child message.translate="some message"/>`;
|
||||||
|
static components = { Child };
|
||||||
|
}
|
||||||
|
|
||||||
|
await mount(Parent, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("some message");
|
||||||
|
});
|
||||||
|
|
||||||
|
test(".translate props are translated", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-esc="props.message"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`<Child message.translate="some message"/>`;
|
||||||
|
static components = { Child };
|
||||||
|
}
|
||||||
|
|
||||||
|
await mount(Parent, fixture, { translateFn: () => "translated message" });
|
||||||
|
expect(fixture.innerHTML).toBe("translated message");
|
||||||
|
});
|
||||||
|
|
||||||
test("throw if prop uses an unknown suffix", async () => {
|
test("throw if prop uses an unknown suffix", async () => {
|
||||||
class Child extends Component {
|
class Child extends Component {
|
||||||
static template = xml`<t t-esc="props.val"/>`;
|
static template = xml`<t t-esc="props.val"/>`;
|
||||||
@@ -330,29 +362,33 @@ test(".alike suffix in a simple case", async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("01");
|
expect(fixture.innerHTML).toBe("01");
|
||||||
parent.state.counter++;
|
parent.state.counter++;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("11");
|
expect(fixture.innerHTML).toBe("11");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test(".alike suffix in a list", async () => {
|
test(".alike suffix in a list", async () => {
|
||||||
@@ -388,36 +424,40 @@ test(".alike suffix in a list", async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await mount(Parent, fixture);
|
await mount(Parent, fixture);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Todo:setup",
|
"Parent:willRender",
|
||||||
"Todo:willStart",
|
"Todo:setup",
|
||||||
"Todo:setup",
|
"Todo:willStart",
|
||||||
"Todo:willStart",
|
"Todo:setup",
|
||||||
"Parent:rendered",
|
"Todo:willStart",
|
||||||
"Todo:willRender",
|
"Parent:rendered",
|
||||||
"Todo:rendered",
|
"Todo:willRender",
|
||||||
"Todo:willRender",
|
"Todo:rendered",
|
||||||
"Todo:rendered",
|
"Todo:willRender",
|
||||||
"Todo:mounted",
|
"Todo:rendered",
|
||||||
"Todo:mounted",
|
"Todo:mounted",
|
||||||
"Parent:mounted",
|
"Todo:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("<button>1</button><button>2V</button>");
|
expect(fixture.innerHTML).toBe("<button>1</button><button>2V</button>");
|
||||||
fixture.querySelector("button")?.click();
|
fixture.querySelector("button")?.click();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<button>1V</button><button>2V</button>");
|
expect(fixture.innerHTML).toBe("<button>1V</button><button>2V</button>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Todo:willRender",
|
"Parent:rendered",
|
||||||
"Todo:rendered",
|
"Todo:willRender",
|
||||||
"Todo:willPatch",
|
"Todo:rendered",
|
||||||
"Todo:patched",
|
"Todo:willPatch",
|
||||||
"Parent:willPatch",
|
"Todo:patched",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -594,7 +594,7 @@ describe("props validation", () => {
|
|||||||
|
|
||||||
test("props: can be defined with a boolean", async () => {
|
test("props: can be defined with a boolean", async () => {
|
||||||
class SubComp extends Component {
|
class SubComp extends Component {
|
||||||
static props = { message: true };
|
static props = { message: true } as const;
|
||||||
}
|
}
|
||||||
expect(() => {
|
expect(() => {
|
||||||
validateProps(SubComp as any, {});
|
validateProps(SubComp as any, {});
|
||||||
@@ -636,7 +636,7 @@ describe("props validation", () => {
|
|||||||
|
|
||||||
test("props: extra props cause an error, part 2", async () => {
|
test("props: extra props cause an error, part 2", async () => {
|
||||||
class SubComp extends Component {
|
class SubComp extends Component {
|
||||||
static props = { message: true };
|
static props = { message: true } as const;
|
||||||
}
|
}
|
||||||
expect(() => {
|
expect(() => {
|
||||||
validateProps(SubComp as any, { message: 1, flag: true });
|
validateProps(SubComp as any, { message: 1, flag: true });
|
||||||
@@ -829,6 +829,52 @@ describe("props validation", () => {
|
|||||||
expect(error!).toBeDefined();
|
expect(error!).toBeDefined();
|
||||||
expect(error!.message).toBe("Invalid props for component 'Child': 'message' is missing");
|
expect(error!.message).toBe("Invalid props for component 'Child': 'message' is missing");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("can use custom class as type", async () => {
|
||||||
|
class CustomClass {
|
||||||
|
val = "hey";
|
||||||
|
}
|
||||||
|
class Child extends Component {
|
||||||
|
static props = { customObj: CustomClass };
|
||||||
|
static template = xml`<t t-esc="props.customObj.val"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static components = { Child };
|
||||||
|
static template = xml`<Child customObj="customObj" />`;
|
||||||
|
customObj = new CustomClass();
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = new App(Parent, { test: true });
|
||||||
|
await app.mount(fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("hey");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("can use custom class as type: validation failure", async () => {
|
||||||
|
class CustomClass {}
|
||||||
|
class Child extends Component {
|
||||||
|
static props = { customObj: CustomClass };
|
||||||
|
static template = xml`<div>hey</div>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static components = { Child };
|
||||||
|
static template = xml`<Child customObj="customObj" />`;
|
||||||
|
customObj = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = new App(Parent, { test: true });
|
||||||
|
let error: OwlError | undefined;
|
||||||
|
const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
|
||||||
|
await expect(nextAppError(app)).resolves.toThrow(
|
||||||
|
"Invalid props for component 'Child': 'customObj' is not a customclass"
|
||||||
|
);
|
||||||
|
await mountProm;
|
||||||
|
expect(error!).toBeDefined();
|
||||||
|
expect(error!.message).toBe(
|
||||||
|
"Invalid props for component 'Child': 'customObj' is not a customclass"
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import {
|
|||||||
xml,
|
xml,
|
||||||
toRaw,
|
toRaw,
|
||||||
} from "../../src";
|
} from "../../src";
|
||||||
import { makeTestFixture, nextTick, snapshotEverything, useLogLifecycle } from "../helpers";
|
import { makeTestFixture, nextTick, snapshotEverything, steps, useLogLifecycle } from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
|
|
||||||
@@ -175,30 +175,34 @@ describe("reactivity in lifecycle", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("2");
|
expect(fixture.innerHTML).toBe("2");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.content = null;
|
parent.state.content = null;
|
||||||
parent.state.renderChild = false;
|
parent.state.renderChild = false;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Child:willUnmount",
|
"Parent:willPatch",
|
||||||
"Child:willDestroy",
|
"Child:willUnmount",
|
||||||
"Parent:patched",
|
"Child:willDestroy",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("Component is automatically subscribed to reactive object received as prop", async () => {
|
test("Component is automatically subscribed to reactive object received as prop", async () => {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
makeDeferred,
|
makeDeferred,
|
||||||
nextMicroTick,
|
nextMicroTick,
|
||||||
|
steps,
|
||||||
} from "../helpers";
|
} from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
@@ -41,28 +42,32 @@ describe("rendering semantics", () => {
|
|||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("Achild");
|
expect(fixture.innerHTML).toBe("Achild");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.value = "B";
|
parent.state.value = "B";
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("Bchild");
|
expect(fixture.innerHTML).toBe("Bchild");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("can force a render to update sub tree", async () => {
|
test("can force a render to update sub tree", async () => {
|
||||||
@@ -167,18 +172,20 @@ describe("rendering semantics", () => {
|
|||||||
const parent = await mount(Parent, fixture, { env });
|
const parent = await mount(Parent, fixture, { env });
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("parentAchild3");
|
expect(fixture.innerHTML).toBe("parentAchild3");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
value = 4;
|
value = 4;
|
||||||
parent.render(true);
|
parent.render(true);
|
||||||
@@ -187,30 +194,34 @@ describe("rendering semantics", () => {
|
|||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Child:willUpdateProps",
|
"Parent:willRender",
|
||||||
"Parent:rendered",
|
"Child:willUpdateProps",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
]).toBeLogged();
|
"Child:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.value = "B";
|
parent.state.value = "B";
|
||||||
|
|
||||||
await nextTick();
|
await nextTick();
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("parentBchild4");
|
expect(fixture.innerHTML).toBe("parentBchild4");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Child:willUpdateProps",
|
"Parent:willRender",
|
||||||
"Parent:rendered",
|
"Child:willUpdateProps",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Parent:willPatch",
|
"Child:rendered",
|
||||||
"Child:willPatch",
|
"Parent:willPatch",
|
||||||
"Child:patched",
|
"Child:willPatch",
|
||||||
"Parent:patched",
|
"Child:patched",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("props are reactive", async () => {
|
test("props are reactive", async () => {
|
||||||
@@ -235,23 +246,32 @@ describe("rendering semantics", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("1");
|
expect(fixture.innerHTML).toBe("1");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.b = 3;
|
parent.state.b = 3;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("3");
|
expect(fixture.innerHTML).toBe("3");
|
||||||
expect(["Child:willRender", "Child:rendered", "Child:willPatch", "Child:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willRender",
|
||||||
|
"Child:rendered",
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("props are reactive (nested prop)", async () => {
|
test("props are reactive (nested prop)", async () => {
|
||||||
@@ -278,37 +298,48 @@ describe("rendering semantics", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("1");
|
expect(fixture.innerHTML).toBe("1");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.b.c = 3; // parent is now subscribed to 'b' key
|
parent.state.b.c = 3; // parent is now subscribed to 'b' key
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("3");
|
expect(fixture.innerHTML).toBe("3");
|
||||||
expect(["Child:willRender", "Child:rendered", "Child:willPatch", "Child:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willRender",
|
||||||
|
"Child:rendered",
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.b = { c: 444 }; // triggers a parent and a child render
|
parent.state.b = { c: 444 }; // triggers a parent and a child render
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("444");
|
expect(fixture.innerHTML).toBe("444");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Parent:willPatch",
|
"Child:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
"Child:willPatch",
|
"Parent:patched",
|
||||||
"Child:patched",
|
"Child:willPatch",
|
||||||
]).toBeLogged();
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("works as expected for dynamic number of props", async () => {
|
test("works as expected for dynamic number of props", async () => {
|
||||||
@@ -366,41 +397,45 @@ describe("rendering semantics", () => {
|
|||||||
|
|
||||||
const parent = await mount(A, fixture);
|
const parent = await mount(A, fixture);
|
||||||
expect(fixture.innerHTML).toBe("11");
|
expect(fixture.innerHTML).toBe("11");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"A:setup",
|
Array [
|
||||||
"A:willStart",
|
"A:setup",
|
||||||
"A:willRender",
|
"A:willStart",
|
||||||
"B:setup",
|
"A:willRender",
|
||||||
"B:willStart",
|
"B:setup",
|
||||||
"A:rendered",
|
"B:willStart",
|
||||||
"B:willRender",
|
"A:rendered",
|
||||||
"C:setup",
|
"B:willRender",
|
||||||
"C:willStart",
|
"C:setup",
|
||||||
"B:rendered",
|
"C:willStart",
|
||||||
"C:willRender",
|
"B:rendered",
|
||||||
"C:rendered",
|
"C:willRender",
|
||||||
"C:mounted",
|
"C:rendered",
|
||||||
"B:mounted",
|
"C:mounted",
|
||||||
"A:mounted",
|
"B:mounted",
|
||||||
]).toBeLogged();
|
"A:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.obj.val = 3;
|
parent.state.obj.val = 3;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("33");
|
expect(fixture.innerHTML).toBe("33");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"A:willRender",
|
Array [
|
||||||
"A:rendered",
|
"A:willRender",
|
||||||
"C:willRender",
|
"A:rendered",
|
||||||
"C:rendered",
|
"C:willRender",
|
||||||
"A:willPatch",
|
"C:rendered",
|
||||||
"A:patched",
|
"A:willPatch",
|
||||||
"C:willPatch",
|
"A:patched",
|
||||||
"C:patched",
|
"C:willPatch",
|
||||||
]).toBeLogged();
|
"C:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
def.resolve();
|
def.resolve();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`Array []`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -431,51 +466,67 @@ test("force render in case of existing render", async () => {
|
|||||||
}
|
}
|
||||||
const parent = await mount(A, fixture);
|
const parent = await mount(A, fixture);
|
||||||
expect(fixture.innerHTML).toBe("C1");
|
expect(fixture.innerHTML).toBe("C1");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"A:setup",
|
Array [
|
||||||
"A:willStart",
|
"A:setup",
|
||||||
"A:willRender",
|
"A:willStart",
|
||||||
"B:setup",
|
"A:willRender",
|
||||||
"B:willStart",
|
"B:setup",
|
||||||
"A:rendered",
|
"B:willStart",
|
||||||
"B:willRender",
|
"A:rendered",
|
||||||
"C:setup",
|
"B:willRender",
|
||||||
"C:willStart",
|
"C:setup",
|
||||||
"B:rendered",
|
"C:willStart",
|
||||||
"C:willRender",
|
"B:rendered",
|
||||||
"C:rendered",
|
"C:willRender",
|
||||||
"C:mounted",
|
"C:rendered",
|
||||||
"B:mounted",
|
"C:mounted",
|
||||||
"A:mounted",
|
"B:mounted",
|
||||||
]).toBeLogged();
|
"A:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
// trigger a new rendering, blocked in B
|
// trigger a new rendering, blocked in B
|
||||||
parent.state.val = 2;
|
parent.state.val = 2;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["A:willRender", "B:willUpdateProps", "A:rendered"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"A:willRender",
|
||||||
|
"B:willUpdateProps",
|
||||||
|
"A:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
// initiate a new render with deep=true. it should cancel the current render
|
// initiate a new render with deep=true. it should cancel the current render
|
||||||
// and also be blocked in B
|
// and also be blocked in B
|
||||||
parent.render(true);
|
parent.render(true);
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["A:willRender", "B:willUpdateProps", "A:rendered"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"A:willRender",
|
||||||
|
"B:willUpdateProps",
|
||||||
|
"A:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
def.resolve();
|
def.resolve();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
// we check here that the render reaches C (so, that it was properly forced)
|
// we check here that the render reaches C (so, that it was properly forced)
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"B:willRender",
|
Array [
|
||||||
"C:willUpdateProps",
|
"B:willRender",
|
||||||
"B:rendered",
|
"C:willUpdateProps",
|
||||||
"C:willRender",
|
"B:rendered",
|
||||||
"C:rendered",
|
"C:willRender",
|
||||||
"A:willPatch",
|
"C:rendered",
|
||||||
"B:willPatch",
|
"A:willPatch",
|
||||||
"C:willPatch",
|
"B:willPatch",
|
||||||
"C:patched",
|
"C:willPatch",
|
||||||
"B:patched",
|
"C:patched",
|
||||||
"A:patched",
|
"B:patched",
|
||||||
]).toBeLogged();
|
"A:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("children, default props and renderings", async () => {
|
test("children, default props and renderings", async () => {
|
||||||
@@ -503,26 +554,30 @@ test("children, default props and renderings", async () => {
|
|||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("Achild");
|
expect(fixture.innerHTML).toBe("Achild");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.value = "B";
|
parent.state.value = "B";
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("Bchild");
|
expect(fixture.innerHTML).toBe("Bchild");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Parent:patched",
|
"Parent:willPatch",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -179,6 +179,34 @@ describe("slots", () => {
|
|||||||
expect(fixture.innerHTML).toBe("<span>default empty</span>");
|
expect(fixture.innerHTML).toBe("<span>default empty</span>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("can use .translate suffix on slot props", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-esc="props.slots.default.message"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`<Child><t t-set-slot="default" message.translate="some message"/></Child>`;
|
||||||
|
static components = { Child };
|
||||||
|
}
|
||||||
|
|
||||||
|
await mount(Parent, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("some message");
|
||||||
|
});
|
||||||
|
|
||||||
|
test(".translate slot props are translated", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-esc="props.slots.default.message"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`<Child><t t-set-slot="default" message.translate="some message"/></Child>`;
|
||||||
|
static components = { Child };
|
||||||
|
}
|
||||||
|
|
||||||
|
await mount(Parent, fixture, { translateFn: () => "translated message" });
|
||||||
|
expect(fixture.innerHTML).toBe("translated message");
|
||||||
|
});
|
||||||
|
|
||||||
test("default slot with slot scope: shorthand syntax", async () => {
|
test("default slot with slot scope: shorthand syntax", async () => {
|
||||||
let child: any;
|
let child: any;
|
||||||
class Child extends Component {
|
class Child extends Component {
|
||||||
@@ -1673,6 +1701,31 @@ describe("slots", () => {
|
|||||||
expect(fixture.innerHTML).toBe("<div><div><p>Ablip</p><div><p>Bblip</p></div></div></div>");
|
expect(fixture.innerHTML).toBe("<div><div><p>Ablip</p><div><p>Bblip</p></div></div></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("named slot inside named slot in t-component", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-slot="brol"/>`;
|
||||||
|
}
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`
|
||||||
|
<Child>
|
||||||
|
<t t-set-slot="brol">
|
||||||
|
outer
|
||||||
|
<t t-component="Child">
|
||||||
|
<t t-set-slot="brol">
|
||||||
|
<t t-esc="value"/>
|
||||||
|
</t>
|
||||||
|
</t>
|
||||||
|
</t>
|
||||||
|
</Child>`;
|
||||||
|
static components = { Child };
|
||||||
|
Child = Child;
|
||||||
|
value = "inner";
|
||||||
|
}
|
||||||
|
await mount(Parent, fixture);
|
||||||
|
|
||||||
|
expect(fixture.innerHTML).toBe(" outer inner");
|
||||||
|
});
|
||||||
|
|
||||||
test("can render only empty slot", async () => {
|
test("can render only empty slot", async () => {
|
||||||
class Parent extends Component {
|
class Parent extends Component {
|
||||||
static template = xml`<t t-slot="default"/>`;
|
static template = xml`<t t-slot="default"/>`;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Component, mount, useState, xml } from "../../src";
|
import { Component, mount, useState, xml } from "../../src";
|
||||||
import { makeTestFixture, nextTick, snapshotEverything, useLogLifecycle } from "../helpers";
|
import { makeTestFixture, nextTick, snapshotEverything, steps, useLogLifecycle } from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
|
|
||||||
@@ -29,18 +29,20 @@ describe("t-component", () => {
|
|||||||
await mount(Parent, fixture);
|
await mount(Parent, fixture);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("<div>child</div>");
|
expect(fixture.innerHTML).toBe("<div>child</div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("switching dynamic component", async () => {
|
test("switching dynamic component", async () => {
|
||||||
@@ -68,36 +70,40 @@ describe("t-component", () => {
|
|||||||
|
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div>child a</div>");
|
expect(fixture.innerHTML).toBe("<div>child a</div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"ChildA:setup",
|
"Parent:willRender",
|
||||||
"ChildA:willStart",
|
"ChildA:setup",
|
||||||
"Parent:rendered",
|
"ChildA:willStart",
|
||||||
"ChildA:willRender",
|
"Parent:rendered",
|
||||||
"ChildA:rendered",
|
"ChildA:willRender",
|
||||||
"ChildA:mounted",
|
"ChildA:rendered",
|
||||||
"Parent:mounted",
|
"ChildA:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.Child = ChildB;
|
parent.Child = ChildB;
|
||||||
parent.render();
|
parent.render();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("child b");
|
expect(fixture.innerHTML).toBe("child b");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"ChildB:setup",
|
"Parent:willRender",
|
||||||
"ChildB:willStart",
|
"ChildB:setup",
|
||||||
"Parent:rendered",
|
"ChildB:willStart",
|
||||||
"ChildB:willRender",
|
"Parent:rendered",
|
||||||
"ChildB:rendered",
|
"ChildB:willRender",
|
||||||
"Parent:willPatch",
|
"ChildB:rendered",
|
||||||
"ChildA:willUnmount",
|
"Parent:willPatch",
|
||||||
"ChildA:willDestroy",
|
"ChildA:willUnmount",
|
||||||
"ChildB:mounted",
|
"ChildA:willDestroy",
|
||||||
"Parent:patched",
|
"ChildB:mounted",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("can switch between dynamic components without the need for a t-key", async () => {
|
test("can switch between dynamic components without the need for a t-key", async () => {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
nextAppError,
|
nextAppError,
|
||||||
nextTick,
|
nextTick,
|
||||||
snapshotEverything,
|
snapshotEverything,
|
||||||
|
steps,
|
||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
} from "../helpers";
|
} from "../helpers";
|
||||||
|
|
||||||
@@ -91,23 +92,25 @@ describe("list of components", () => {
|
|||||||
expect(fixture.innerHTML).toBe(
|
expect(fixture.innerHTML).toBe(
|
||||||
"<div><ul><li><div>1</div></li><li><div>2</div></li></ul></div>"
|
"<div><ul><li><div>1</div></li><li><div>2</div></li></ul></div>"
|
||||||
);
|
);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:setup",
|
"Child:willStart",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Child:mounted",
|
"Child:mounted",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("reconciliation alg works for t-foreach in t-foreach", async () => {
|
test("reconciliation alg works for t-foreach in t-foreach", async () => {
|
||||||
|
|||||||
@@ -331,6 +331,32 @@ describe("t-model directive", () => {
|
|||||||
expect(fixture.innerHTML).toBe("<div><input><span>test</span></div>");
|
expect(fixture.innerHTML).toBe("<div><input><span>test</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test(".trim modifier implies .lazy modifier", async () => {
|
||||||
|
class SomeComponent extends Component {
|
||||||
|
static template = xml`
|
||||||
|
<div>
|
||||||
|
<input t-model.trim="state.text"/>
|
||||||
|
<span><t t-esc="state.text"/></span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
state = useState({ text: "" });
|
||||||
|
}
|
||||||
|
const comp = await mount(SomeComponent, fixture);
|
||||||
|
|
||||||
|
expect(fixture.innerHTML).toBe("<div><input><span></span></div>");
|
||||||
|
|
||||||
|
const input = fixture.querySelector("input")!;
|
||||||
|
input.value = "test ";
|
||||||
|
input.dispatchEvent(new Event("input"));
|
||||||
|
await nextTick();
|
||||||
|
expect(comp.state.text).toBe("");
|
||||||
|
expect(fixture.innerHTML).toBe("<div><input><span></span></div>");
|
||||||
|
input.dispatchEvent(new Event("change"));
|
||||||
|
await nextTick();
|
||||||
|
expect(comp.state.text).toBe("test");
|
||||||
|
expect(fixture.innerHTML).toBe("<div><input><span>test</span></div>");
|
||||||
|
});
|
||||||
|
|
||||||
test(".number modifier", async () => {
|
test(".number modifier", async () => {
|
||||||
class SomeComponent extends Component {
|
class SomeComponent extends Component {
|
||||||
static template = xml`
|
static template = xml`
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ export function snapshotEverything() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const steps: string[] = [];
|
export const steps: string[] = [];
|
||||||
|
|
||||||
export function logStep(step: string) {
|
export function logStep(step: string) {
|
||||||
steps.push(step);
|
steps.push(step);
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {
|
|||||||
nextMicroTick,
|
nextMicroTick,
|
||||||
nextTick,
|
nextTick,
|
||||||
snapshotEverything,
|
snapshotEverything,
|
||||||
|
steps,
|
||||||
useLogLifecycle,
|
useLogLifecycle,
|
||||||
} from "./helpers";
|
} from "./helpers";
|
||||||
|
|
||||||
@@ -992,32 +993,33 @@ describe("Reactivity", () => {
|
|||||||
const obj2 = createReactive({ b: {} }, () => n2++);
|
const obj2 = createReactive({ b: {} }, () => n2++);
|
||||||
const obj3 = createReactive({ c: {} }, () => n3++);
|
const obj3 = createReactive({ c: {} }, () => n3++);
|
||||||
|
|
||||||
|
// assign the same object should'nt notify reactivity
|
||||||
obj2.b = obj2.b;
|
obj2.b = obj2.b;
|
||||||
obj2.b;
|
obj2.b;
|
||||||
obj3.c = obj3.c;
|
obj3.c = obj3.c;
|
||||||
obj3.c;
|
obj3.c;
|
||||||
expect(n1).toBe(0);
|
expect(n1).toBe(0);
|
||||||
expect(n2).toBe(1);
|
expect(n2).toBe(0);
|
||||||
expect(n3).toBe(1);
|
expect(n3).toBe(0);
|
||||||
|
|
||||||
obj2.b = obj1;
|
obj2.b = obj1;
|
||||||
obj2.b;
|
obj2.b;
|
||||||
obj3.c = obj1;
|
obj3.c = obj1;
|
||||||
obj3.c;
|
obj3.c;
|
||||||
expect(n1).toBe(0);
|
expect(n1).toBe(0);
|
||||||
expect(n2).toBe(2);
|
expect(n2).toBe(1);
|
||||||
expect(n3).toBe(2);
|
expect(n3).toBe(1);
|
||||||
|
|
||||||
obj1.a = obj1.a + 2;
|
obj1.a = obj1.a + 2;
|
||||||
obj1.a;
|
obj1.a;
|
||||||
expect(n1).toBe(1);
|
expect(n1).toBe(1);
|
||||||
expect(n2).toBe(2);
|
expect(n2).toBe(1);
|
||||||
expect(n3).toBe(2);
|
expect(n3).toBe(1);
|
||||||
|
|
||||||
obj2.b.a = obj2.b.a + 1;
|
obj2.b.a = obj2.b.a + 1;
|
||||||
expect(n1).toBe(2);
|
expect(n1).toBe(2);
|
||||||
expect(n2).toBe(3);
|
expect(n2).toBe(2);
|
||||||
expect(n3).toBe(2);
|
expect(n3).toBe(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("reactive inside other: reading the inner reactive from outer doesn't affect the inner's subscriptions", async () => {
|
test("reactive inside other: reading the inner reactive from outer doesn't affect the inner's subscriptions", async () => {
|
||||||
@@ -1850,37 +1852,41 @@ describe("Reactivity: useState", () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
await mount(Parent, fixture);
|
await mount(Parent, fixture);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:setup",
|
"Child:willStart",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Child:mounted",
|
"Child:mounted",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
||||||
testContext.value = 321;
|
testContext.value = 321;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:willRender",
|
Array [
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willPatch",
|
"Child:rendered",
|
||||||
"Child:patched",
|
"Child:willPatch",
|
||||||
"Child:willPatch",
|
"Child:patched",
|
||||||
"Child:patched",
|
"Child:willPatch",
|
||||||
]).toBeLogged();
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>321</span><span>321</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>321</span><span>321</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1904,38 +1910,49 @@ describe("Reactivity: useState", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await mount(Parent, fixture);
|
await mount(Parent, fixture);
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Child:setup",
|
"Child:willStart",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Child:mounted",
|
"Child:mounted",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
||||||
testContext.value = 321;
|
testContext.value = 321;
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:willRender",
|
Array [
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
]).toBeLogged();
|
"Child:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span><span>123</span></div>");
|
||||||
|
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["Child:willPatch", "Child:patched", "Child:willPatch", "Child:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>321</span><span>321</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>321</span><span>321</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1969,43 +1986,54 @@ describe("Reactivity: useState", () => {
|
|||||||
|
|
||||||
await mount(GrandFather, fixture);
|
await mount(GrandFather, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span><div><span>123</span></div></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span><div><span>123</span></div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"GrandFather:setup",
|
Array [
|
||||||
"GrandFather:willStart",
|
"GrandFather:setup",
|
||||||
"GrandFather:willRender",
|
"GrandFather:willStart",
|
||||||
"Child:setup",
|
"GrandFather:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:setup",
|
"Child:willStart",
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"GrandFather:rendered",
|
"Parent:willStart",
|
||||||
"Child:willRender",
|
"GrandFather:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Parent:willRender",
|
"Child:rendered",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
"Child:mounted",
|
"Parent:mounted",
|
||||||
"GrandFather:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"GrandFather:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
testContext.value = 321;
|
testContext.value = 321;
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
await nextMicroTick();
|
await nextMicroTick();
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span><div><span>123</span></div></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span><div><span>123</span></div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Child:willRender",
|
Array [
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:willRender",
|
"Child:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
]).toBeLogged();
|
"Child:rendered",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<div><span>321</span><div><span>321</span></div></div>");
|
expect(fixture.innerHTML).toBe("<div><span>321</span><div><span>321</span></div></div>");
|
||||||
expect(["Child:willPatch", "Child:patched", "Child:willPatch", "Child:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("one components can subscribe twice to same context", async () => {
|
test("one components can subscribe twice to same context", async () => {
|
||||||
@@ -2181,38 +2209,49 @@ describe("Reactivity: useState", () => {
|
|||||||
}
|
}
|
||||||
const parent = await mount(Parent, fixture);
|
const parent = await mount(Parent, fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>123</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>123</span></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:setup",
|
Array [
|
||||||
"Parent:willStart",
|
"Parent:setup",
|
||||||
"Parent:willRender",
|
"Parent:willStart",
|
||||||
"Child:setup",
|
"Parent:willRender",
|
||||||
"Child:willStart",
|
"Child:setup",
|
||||||
"Parent:rendered",
|
"Child:willStart",
|
||||||
"Child:willRender",
|
"Parent:rendered",
|
||||||
"Child:rendered",
|
"Child:willRender",
|
||||||
"Child:mounted",
|
"Child:rendered",
|
||||||
"Parent:mounted",
|
"Child:mounted",
|
||||||
]).toBeLogged();
|
"Parent:mounted",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
testContext.a = 321;
|
testContext.a = 321;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(["Child:willRender", "Child:rendered", "Child:willPatch", "Child:patched"]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
|
Array [
|
||||||
|
"Child:willRender",
|
||||||
|
"Child:rendered",
|
||||||
|
"Child:willPatch",
|
||||||
|
"Child:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
parent.state.flag = false;
|
parent.state.flag = false;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
expect([
|
expect(steps.splice(0)).toMatchInlineSnapshot(`
|
||||||
"Parent:willRender",
|
Array [
|
||||||
"Parent:rendered",
|
"Parent:willRender",
|
||||||
"Parent:willPatch",
|
"Parent:rendered",
|
||||||
"Child:willUnmount",
|
"Parent:willPatch",
|
||||||
"Child:willDestroy",
|
"Child:willUnmount",
|
||||||
"Parent:patched",
|
"Child:willDestroy",
|
||||||
]).toBeLogged();
|
"Parent:patched",
|
||||||
|
]
|
||||||
|
`);
|
||||||
|
|
||||||
testContext.a = 456;
|
testContext.a = 456;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect([]).toBeLogged();
|
expect(steps.splice(0)).toMatchInlineSnapshot(`Array []`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("destroyed component before being mounted is inactive", async () => {
|
test("destroyed component before being mounted is inactive", async () => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Owl devtools",
|
"name": "Owl devtools",
|
||||||
"version": "1.2.1",
|
"version": "1.2.2",
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"description": "Chrome devtools extension for Odoo Owl framework",
|
"description": "Chrome devtools extension for Odoo Owl framework",
|
||||||
"icons": {
|
"icons": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Owl devtools",
|
"name": "Owl devtools",
|
||||||
"version": "1.0",
|
"version": "1.0.0",
|
||||||
"description": "Firefox devtools extension for Odoo Owl framework",
|
"description": "Firefox devtools extension for Odoo Owl framework",
|
||||||
"manifest_version": 2,
|
"manifest_version": 2,
|
||||||
"browser_specific_settings": {
|
"browser_specific_settings": {
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
"scripts": ["background.js"]
|
"scripts": ["background.js"]
|
||||||
},
|
},
|
||||||
"devtools_page": "devtools_app/devtools.html",
|
"devtools_page": "devtools_app/devtools.html",
|
||||||
"content_security_policy": "script-src 'self' 'unsafe-eval' blob:; object-src 'self'",
|
"content_security_policy": "script-src 'self'; object-src 'self'",
|
||||||
"content_scripts": [
|
"content_scripts": [
|
||||||
{
|
{
|
||||||
"matches": ["<all_urls>"],
|
"matches": ["<all_urls>"],
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { IS_FIREFOX, getActiveTabURL } from "./utils";
|
import { IS_FIREFOX, getActiveTabURL, browserInstance } from "./utils";
|
||||||
|
|
||||||
let owlStatus = 0;
|
let owlStatus = 0;
|
||||||
|
|
||||||
const browserInstance = IS_FIREFOX ? browser : chrome;
|
|
||||||
|
|
||||||
// Used to keep track of the tabs where the owl devtools have been opened
|
// Used to keep track of the tabs where the owl devtools have been opened
|
||||||
const activePanels = new Map();
|
const activePanels = new Map();
|
||||||
|
|
||||||
@@ -71,6 +69,9 @@ function checkOwlStatus(tabId) {
|
|||||||
browserInstance.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
|
browserInstance.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
|
||||||
// Send back the owl status to the sender
|
// Send back the owl status to the sender
|
||||||
if (message.type === "getOwlStatus") {
|
if (message.type === "getOwlStatus") {
|
||||||
|
if (IS_FIREFOX) {
|
||||||
|
return { result: owlStatus };
|
||||||
|
}
|
||||||
sendResponse({ result: owlStatus });
|
sendResponse({ result: owlStatus });
|
||||||
return true;
|
return true;
|
||||||
} else if (message.type === "owlStatus") {
|
} else if (message.type === "owlStatus") {
|
||||||
@@ -112,11 +113,10 @@ browserInstance.runtime.onMessage.addListener(async (message, sender, sendRespon
|
|||||||
}, 750);
|
}, 750);
|
||||||
activePanels.set(message.id, { port: port, expirationTimeout: expirationTimeout });
|
activePanels.set(message.id, { port: port, expirationTimeout: expirationTimeout });
|
||||||
// This is solely for firefox which doesnt allow access to the chrome.tabs api inside devtools
|
// This is solely for firefox which doesnt allow access to the chrome.tabs api inside devtools
|
||||||
|
// We therefore only use the firefox syntax to send the response here
|
||||||
} else if (message.type === "getActiveTabURL") {
|
} else if (message.type === "getActiveTabURL") {
|
||||||
getActiveTabURL().then((tab) => {
|
const tab = await getActiveTabURL();
|
||||||
sendResponse({ result: tab });
|
return { result: tab };
|
||||||
});
|
|
||||||
return true;
|
|
||||||
} else {
|
} else {
|
||||||
const destinationPanel = activePanels.get(sender.tab.id);
|
const destinationPanel = activePanels.get(sender.tab.id);
|
||||||
if (destinationPanel) {
|
if (destinationPanel) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import globalHook from "./page_scripts/owl_devtools_global_hook";
|
import globalHook from "./page_scripts/owl_devtools_global_hook";
|
||||||
import { IS_FIREFOX } from "./utils";
|
import { IS_FIREFOX, browserInstance } from "./utils";
|
||||||
|
|
||||||
// Relays the owlDevtools__... type top window messages to the background script so that it can relay it to the devtools app
|
// Relays the owlDevtools__... type top window messages to the background script so that it can relay it to the devtools app
|
||||||
window.addEventListener(
|
window.addEventListener(
|
||||||
@@ -7,7 +7,7 @@ window.addEventListener(
|
|||||||
function (event) {
|
function (event) {
|
||||||
if (event.data.type && event.data.source === "owl-devtools") {
|
if (event.data.type && event.data.source === "owl-devtools") {
|
||||||
try {
|
try {
|
||||||
chrome.runtime.sendMessage(
|
browserInstance.runtime.sendMessage(
|
||||||
event.data.data
|
event.data.data
|
||||||
? { type: event.data.type, data: event.data.data, origin: event.data.origin }
|
? { type: event.data.type, data: event.data.data, origin: event.data.origin }
|
||||||
: { type: event.data.type, origin: event.data.origin }
|
: { type: event.data.type, origin: event.data.origin }
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { IS_FIREFOX } from "../utils";
|
import { IS_FIREFOX, browserInstance } from "../utils";
|
||||||
|
|
||||||
let created = false;
|
let created = false;
|
||||||
let browserInstance = IS_FIREFOX ? browser : chrome;
|
|
||||||
|
|
||||||
// Try to load the owl panel each 1000 ms in case it (re)appears on the page later on
|
// Try to load the owl panel each 1000 ms in case it (re)appears on the page later on
|
||||||
const checkInterval = setInterval(createPanelsIfOwl, 1000);
|
const checkInterval = setInterval(createPanelsIfOwl, 1000);
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<templates xml:space="preserve">
|
<templates xml:space="preserve">
|
||||||
<t t-name="devtools.ComponentSearchBar" owl="1">
|
<t t-name="devtools.ComponentSearchBar" owl="1">
|
||||||
<div class="pointer-icon ms-1 px-2 py-1" t-on-click.stop='() => this.store.toggleSelector()'>
|
<div class="mouse-icon p-1" t-on-click.stop='() => this.store.toggleSelector()'>
|
||||||
<i title="Select an element in the page to inspect the corresponding component" class="fa fa-mouse-pointer" t-attf-style="color: {{store.componentSearch.activeSelector ? 'var(--active-icon)' : 'var(--text-color)'}};"></i>
|
<i title="Select an element in the page to inspect the corresponding component" class="fa fa-fw fa-mouse-pointer" t-attf-style="color: {{store.componentSearch.activeSelector ? 'var(--active-icon)' : 'var(--text-color)'}};"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="icons-separator"/>
|
<div class="icons-separator"/>
|
||||||
<div class="d-flex align-items-center ms-2 flex-grow-1">
|
<div class="d-flex align-items-center ms-2 flex-grow-1">
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ export class ComponentsTab extends Component {
|
|||||||
this.store = useStore();
|
this.store = useStore();
|
||||||
this.flushRendersTimeout = false;
|
this.flushRendersTimeout = false;
|
||||||
useExternalListener(document, "keydown", this.onKeyboardEvent);
|
useExternalListener(document, "keydown", this.onKeyboardEvent);
|
||||||
|
useExternalListener(window, "resize", this.onWindowResize);
|
||||||
|
|
||||||
onWillUnmount(() => {
|
onWillUnmount(() => {
|
||||||
window.removeEventListener("mousemove", this.onMouseMove);
|
window.removeEventListener("mousemove", this.onMouseMove);
|
||||||
@@ -53,9 +54,11 @@ export class ComponentsTab extends Component {
|
|||||||
|
|
||||||
// Adjust the position of the split between the left and right right window of the components tab
|
// Adjust the position of the split between the left and right right window of the components tab
|
||||||
onMouseMove = (event) => {
|
onMouseMove = (event) => {
|
||||||
|
const minWidth = (147 / window.innerWidth) * 100;
|
||||||
|
const maxWidth = 100 - (100 / window.innerWidth) * 100;
|
||||||
this.store.splitPosition = Math.max(
|
this.store.splitPosition = Math.max(
|
||||||
Math.min((event.clientX / window.innerWidth) * 100, 85),
|
Math.min((event.clientX / window.innerWidth) * 100, maxWidth),
|
||||||
15
|
minWidth
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -64,4 +67,11 @@ export class ComponentsTab extends Component {
|
|||||||
window.removeEventListener("mousemove", this.onMouseMove);
|
window.removeEventListener("mousemove", this.onMouseMove);
|
||||||
window.removeEventListener("mouseup", this.onMouseUp);
|
window.removeEventListener("mouseup", this.onMouseUp);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
onWindowResize = () => {
|
||||||
|
const minWidth = (147 / window.innerWidth) * 100;
|
||||||
|
if (minWidth <= 100) {
|
||||||
|
this.store.splitPosition = Math.max(this.store.splitPosition, minWidth);
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
<templates xml:space="preserve">
|
<templates xml:space="preserve">
|
||||||
<t t-name="devtools.ObjectTreeElement" owl="1">
|
<t t-name="devtools.ObjectTreeElement" owl="1">
|
||||||
<div class="m-0 p-0 text-nowrap w-100 object-line"
|
<div class="m-0 p-0 text-nowrap w-100 object-line"
|
||||||
t-att-class="props.class"
|
t-att-class="props.class + (props.object.hasChildren ? ' bg-feedback' : '')"
|
||||||
t-on-click.stop="() => this.store.toggleObjectTreeElementsDisplay(this.props.object)"
|
t-on-click.stop="() => this.store.toggleObjectTreeElementsDisplay(this.props.object)"
|
||||||
t-on-contextmenu.prevent="openMenu"
|
t-on-contextmenu.prevent="openMenu"
|
||||||
>
|
>
|
||||||
<div t-attf-style="padding-left: {{objectPadding}}rem">
|
<div t-attf-style="padding-left: {{objectPadding}}rem">
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
/** @odoo-module **/
|
/** @odoo-module **/
|
||||||
|
|
||||||
import { isElementInCenterViewport, minimizeKey, IS_FIREFOX } from "../../../../utils";
|
import { isElementInCenterViewport, minimizeKey, browserInstance } from "../../../../utils";
|
||||||
import { useStore } from "../../../store/store";
|
import { useStore } from "../../../store/store";
|
||||||
import { HighlightText } from "./highlight_text/highlight_text";
|
import { HighlightText } from "./highlight_text/highlight_text";
|
||||||
|
|
||||||
const browserInstance = IS_FIREFOX ? browser : chrome;
|
|
||||||
|
|
||||||
const { Component, useRef, useState, useEffect, onMounted } = owl;
|
const { Component, useRef, useState, useEffect, onMounted } = owl;
|
||||||
|
|
||||||
export class TreeElement extends Component {
|
export class TreeElement extends Component {
|
||||||
|
|||||||
@@ -16,9 +16,9 @@
|
|||||||
<option t-att-value="frame"><t t-esc="frame"/></option>
|
<option t-att-value="frame"><t t-esc="frame"/></option>
|
||||||
</t>
|
</t>
|
||||||
</select>
|
</select>
|
||||||
<i class="ms-auto p-1 me-1 lg-icon fa fa-question-circle pointer-icon" title="Open devtools doc" t-on-click.stop="() => this.store.openDocumentation()"></i>
|
<i class="ms-auto p-1 me-1 lg-icon fa fa-question-circle navbar-icon" title="Open devtools doc" t-on-click.stop="() => this.store.openDocumentation()"></i>
|
||||||
<i class="p-1 me-1 lg-icon fa pointer-icon" title="Toggle dark mode" t-att-class="{ 'fa-sun-o': store.settings.darkMode, 'fa-moon-o' : !store.settings.darkMode}" t-on-click.stop="() => this.store.toggleDarkMode()"></i>
|
<i class="p-1 me-1 lg-icon fa navbar-icon" title="Toggle dark mode" t-att-class="{ 'fa-sun-o': store.settings.darkMode, 'fa-moon-o' : !store.settings.darkMode}" t-on-click.stop="() => this.store.toggleDarkMode()"></i>
|
||||||
<i class="p-1 me-1 lg-icon fa fa-repeat pointer-icon" title="Refresh extension" t-on-click.stop="() => this.store.refreshExtension()"></i>
|
<i class="p-1 me-1 lg-icon fa fa-repeat navbar-icon" title="Refresh extension" t-on-click.stop="() => this.store.refreshExtension()"></i>
|
||||||
</div>
|
</div>
|
||||||
<ComponentsTab t-if="store.page === 'ComponentsTab'"/>
|
<ComponentsTab t-if="store.page === 'ComponentsTab'"/>
|
||||||
<ProfilerTab t-if="store.page === 'ProfilerTab'"/>
|
<ProfilerTab t-if="store.page === 'ProfilerTab'"/>
|
||||||
|
|||||||
@@ -3,20 +3,20 @@
|
|||||||
<t t-name="devtools.ProfilerTab" owl="1">
|
<t t-name="devtools.ProfilerTab" owl="1">
|
||||||
<div class="position-relative overflow-hidden d-flex flex-column h-100">
|
<div class="position-relative overflow-hidden d-flex flex-column h-100">
|
||||||
<div class="panel-top d-flex align-items-center">
|
<div class="panel-top d-flex align-items-center">
|
||||||
<i title="Start/Stop Recording" class="fa fa-circle pointer-icon ms-1 p-1" t-attf-style="color: {{store.activeRecorder ? 'var(--active-recorder)' : 'var(--text-color)'}};" t-on-click.stop="() => this.store.toggleRecording()" aria-hidden="true"></i>
|
<i title="Start/Stop Recording" class="fa fa-circle profiler-icon p-2" t-attf-style="color: {{store.activeRecorder ? 'var(--active-recorder)' : 'var(--text-color)'}};" t-on-click.stop="() => this.store.toggleRecording()" aria-hidden="true"></i>
|
||||||
<i title="Clear events" class="fa fa-ban pointer-icon p-1 px-2" t-on-click.stop="() => this.store.clearEventsConsole()" aria-hidden="true"></i>
|
<i title="Clear events" class="fa fa-ban profiler-icon p-2" t-on-click.stop="() => this.store.clearEventsConsole()" aria-hidden="true"></i>
|
||||||
<div class="icons-separator mx-1"/>
|
<div class="icons-separator"/>
|
||||||
<select class="form-select form-select-sm custom-select border-0" t-on-change="selectDisplayMode">
|
<select class="form-select form-select-sm custom-select pointer-icon border-0" t-on-change="selectDisplayMode">
|
||||||
<option t-att-selected="store.eventsTreeView" value="Tree">Tree view</option>
|
<option t-att-selected="store.eventsTreeView" value="Tree">Tree view</option>
|
||||||
<option t-att-selected="!store.eventsTreeView" value="List">Events log</option>
|
<option t-att-selected="!store.eventsTreeView" value="List">Events log</option>
|
||||||
</select>
|
</select>
|
||||||
<i title="Collapse All" type="button" class="fa fa-list me-2" t-on-click="() => this.store.collapseAll()" t-attf-style="{{store.eventsTreeView ? '' : 'visibility: hidden;'}}"></i>
|
<i title="Collapse All" class="fa fa-list p-2 profiler-icon" t-on-click="() => this.store.collapseAll()" t-attf-style="{{store.eventsTreeView ? '' : 'display: none;'}}"></i>
|
||||||
<div class="icons-separator"/>
|
<div class="icons-separator"/>
|
||||||
<label class="mx-2 form-check-label pointer-icon" title="Trace renderings in console">
|
<label class="p-1 mx-1 form-check-label pointer-icon" title="Trace renderings in console">
|
||||||
<input type="checkbox" class="form-check-input me-1" t-att-checked="store.traceRenderings" t-on-input="() => this.store.toggleTracing()"/> Trace Renderings
|
<input type="checkbox" class="form-check-input me-1 pointer-icon" t-att-checked="store.traceRenderings" t-on-input="() => this.store.toggleTracing()"/> Trace Renderings
|
||||||
</label>
|
</label>
|
||||||
<label class="mx-2 form-check-label pointer-icon" title="Trace subscriptions in console (warning: it is VERY verbose)">
|
<label class="p-1 mx-1 form-check-label pointer-icon" title="Trace subscriptions in console (warning: it is VERY verbose)">
|
||||||
<input type="checkbox" class="form-check-input me-1" t-att-checked="store.traceSubscriptions" t-on-input="() => this.store.toggleSubscriptionTracing()"/> Trace Subscriptions
|
<input type="checkbox" class="form-check-input me-1 pointer-icon" t-att-checked="store.traceSubscriptions" t-on-input="() => this.store.toggleSubscriptionTracing()"/> Trace Subscriptions
|
||||||
</label>
|
</label>
|
||||||
<!-- <EventSearchBar/> -->
|
<!-- <EventSearchBar/> -->
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
const { reactive, useState, toRaw } = owl;
|
const { reactive, useState, toRaw } = owl;
|
||||||
import { fuzzySearch, IS_FIREFOX, getActiveTabURL } from "../../utils";
|
import { fuzzySearch, IS_FIREFOX, getActiveTabURL, browserInstance } from "../../utils";
|
||||||
import globalHook from "../../page_scripts/owl_devtools_global_hook";
|
import globalHook from "../../page_scripts/owl_devtools_global_hook";
|
||||||
|
|
||||||
const browserInstance = IS_FIREFOX ? browser : chrome;
|
|
||||||
|
|
||||||
// Main store which contains all states that needs to be maintained throughout all components in the devtools app
|
// Main store which contains all states that needs to be maintained throughout all components in the devtools app
|
||||||
export const store = reactive({
|
export const store = reactive({
|
||||||
devtoolsId: 0,
|
devtoolsId: 0,
|
||||||
@@ -115,6 +113,9 @@ export const store = reactive({
|
|||||||
}
|
}
|
||||||
keepEnvLit(details);
|
keepEnvLit(details);
|
||||||
this.activeComponent = details;
|
this.activeComponent = details;
|
||||||
|
if (this.componentSearch.search.length) {
|
||||||
|
this.updateSearch(this.componentSearch.search);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// Select a component by retrieving its details from the page based on its path
|
// Select a component by retrieving its details from the page based on its path
|
||||||
@@ -146,6 +147,7 @@ export const store = reactive({
|
|||||||
}
|
}
|
||||||
component.selected = true;
|
component.selected = true;
|
||||||
highlightChildren(component);
|
highlightChildren(component);
|
||||||
|
this.highlightComponent(path);
|
||||||
const details = await evalFunctionInWindow(
|
const details = await evalFunctionInWindow(
|
||||||
"getComponentDetails",
|
"getComponentDetails",
|
||||||
[component.path],
|
[component.path],
|
||||||
@@ -346,7 +348,7 @@ export const store = reactive({
|
|||||||
|
|
||||||
// Expand the children of the input object property and load it from page if necessary
|
// Expand the children of the input object property and load it from page if necessary
|
||||||
async toggleObjectTreeElementsDisplay(obj) {
|
async toggleObjectTreeElementsDisplay(obj) {
|
||||||
if (!obj.hasChildren) {
|
if (!obj.hasChildren || window.getSelection().toString().length) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Since it is sometimes impossible (and always ineffective) to load all descendants of a property
|
// Since it is sometimes impossible (and always ineffective) to load all descendants of a property
|
||||||
@@ -939,10 +941,9 @@ function arraysEqual(arr1, arr2) {
|
|||||||
|
|
||||||
async function getTabURL() {
|
async function getTabURL() {
|
||||||
if (IS_FIREFOX) {
|
if (IS_FIREFOX) {
|
||||||
// This happens in firefox when the method is called inside devtools so we ask the background to execute it instead
|
// It is not possible to run getActiveTabURL inside the devtools when using firefox so we ask the background to execute it instead
|
||||||
browserInstance.runtime.sendMessage({ type: "getActiveTabURL" }).then((response) => {
|
const response = await browserInstance.runtime.sendMessage({ type: "getActiveTabURL" });
|
||||||
return response.result;
|
return response.result;
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
return await getActiveTabURL();
|
return await getActiveTabURL();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,8 @@
|
|||||||
--text-selected: white;
|
--text-selected: white;
|
||||||
--menu-highlight-bg: rgb(201, 201, 201);
|
--menu-highlight-bg: rgb(201, 201, 201);
|
||||||
--version-bg: teal;
|
--version-bg: teal;
|
||||||
|
--hover-bg: #ebebeb;
|
||||||
|
--navbar-hover-bg: #d3d3d3;
|
||||||
/* to change the color here, put it in stroke='%23[color in hexadecimal]' */
|
/* to change the color here, put it in stroke='%23[color in hexadecimal]' */
|
||||||
--select-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23444444' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
|
--select-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23444444' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
|
||||||
}
|
}
|
||||||
@@ -52,6 +54,8 @@
|
|||||||
--text-selected: #c9c9c9;
|
--text-selected: #c9c9c9;
|
||||||
--menu-highlight-bg: rgb(65, 65, 65);
|
--menu-highlight-bg: rgb(65, 65, 65);
|
||||||
--version-bg: #805900ad;
|
--version-bg: #805900ad;
|
||||||
|
--hover-bg: #575757;
|
||||||
|
--navbar-hover-bg: #6b6b6b;
|
||||||
color-scheme: dark;
|
color-scheme: dark;
|
||||||
/* to change the color here, put it in stroke='%23[color in hexadecimal]' */
|
/* to change the color here, put it in stroke='%23[color in hexadecimal]' */
|
||||||
--select-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23c9c9c9' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
|
--select-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23c9c9c9' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
|
||||||
@@ -82,6 +86,10 @@
|
|||||||
color: var(--text-color) !important;
|
color: var(--text-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.form-check-label {
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
.navbar-btn {
|
.navbar-btn {
|
||||||
height: 23px;
|
height: 23px;
|
||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
@@ -244,7 +252,7 @@
|
|||||||
.search-input {
|
.search-input {
|
||||||
background-color: var(--background-color);
|
background-color: var(--background-color);
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
padding: 0.4rem 0rem;
|
padding: 0.37rem 0rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.search-icon {
|
.search-icon {
|
||||||
@@ -255,6 +263,35 @@
|
|||||||
.utility-icon {
|
.utility-icon {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 1.2em;
|
font-size: 1.2em;
|
||||||
|
border-radius: 35%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mouse-icon {
|
||||||
|
border-radius: 35%;
|
||||||
|
cursor: pointer;
|
||||||
|
padding-left: 0.4rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profiler-icon {
|
||||||
|
border-radius: 35%;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.utility-icon:hover, .mouse-icon:hover, .profiler-icon:hover, .bg-feedback:hover {
|
||||||
|
background-color: var(--hover-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-icon {
|
||||||
|
border-radius: 35%;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-icon:hover {
|
||||||
|
background-color: var(--navbar-hover-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg-feedback {
|
||||||
|
border-radius: 5%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lg-icon {
|
.lg-icon {
|
||||||
@@ -281,7 +318,7 @@
|
|||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
background-color: var(--background-color);
|
background-color: var(--background-color);
|
||||||
border: 1px solid gray;
|
border: 1px solid gray;
|
||||||
z-index: 1;
|
z-index: 2;
|
||||||
box-shadow: 1px 2px 5px #888;
|
box-shadow: 1px 2px 5px #888;
|
||||||
font-family: var(--bs-font-sans-serif);
|
font-family: var(--bs-font-sans-serif);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
this.traceRenderings = false;
|
this.traceRenderings = false;
|
||||||
this.traceSubscriptions = false;
|
this.traceSubscriptions = false;
|
||||||
this.requestedFrame = false;
|
this.requestedFrame = false;
|
||||||
|
this.enabledSelector = false;
|
||||||
this.eventsBatch = [];
|
this.eventsBatch = [];
|
||||||
// Object which defines how different types of data should be displayed when passed to the devtools
|
// Object which defines how different types of data should be displayed when passed to the devtools
|
||||||
this.serializer = {
|
this.serializer = {
|
||||||
@@ -175,6 +176,7 @@
|
|||||||
|
|
||||||
initDevtools(frame = "top") {
|
initDevtools(frame = "top") {
|
||||||
if (!this.devtoolsInit) {
|
if (!this.devtoolsInit) {
|
||||||
|
document.addEventListener("mouseover", this.HTMLSelector, { capture: true });
|
||||||
this.frame = frame;
|
this.frame = frame;
|
||||||
const self = this;
|
const self = this;
|
||||||
// Flush the events batcher when a root render is completed
|
// Flush the events batcher when a root render is completed
|
||||||
@@ -606,28 +608,33 @@
|
|||||||
// Identify the hovered component based on the corresponding DOM element and send the Select message
|
// Identify the hovered component based on the corresponding DOM element and send the Select message
|
||||||
// when the target changes
|
// when the target changes
|
||||||
HTMLSelector = (ev) => {
|
HTMLSelector = (ev) => {
|
||||||
const target = ev.target;
|
if (this.enabledSelector) {
|
||||||
if (!this.currentSelectedElement || !target.isEqualNode(this.currentSelectedElement)) {
|
const target = ev.target;
|
||||||
const path = this.getElementPath(target);
|
if (!this.currentSelectedElement || !target.isEqualNode(this.currentSelectedElement)) {
|
||||||
this.highlightComponent(path);
|
const path = this.getElementPath(target);
|
||||||
this.currentSelectedElement = target;
|
this.highlightComponent(path);
|
||||||
window.top.postMessage({
|
this.currentSelectedElement = target;
|
||||||
source: "owl-devtools",
|
window.top.postMessage({
|
||||||
type: "SelectElement",
|
source: "owl-devtools",
|
||||||
data: path,
|
type: "SelectElement",
|
||||||
});
|
data: path,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.removeHighlights();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Activate the HTML selector tool
|
// Activate the HTML selector tool
|
||||||
enableHTMLSelector() {
|
enableHTMLSelector() {
|
||||||
document.addEventListener("mouseover", this.HTMLSelector, { capture: true });
|
this.enabledSelector = true;
|
||||||
document.addEventListener("click", this.disableHTMLSelector, { capture: true });
|
document.addEventListener("click", this.disableHTMLSelector, { capture: true });
|
||||||
document.addEventListener("mouseout", this.removeHighlights, { capture: true });
|
document.addEventListener("scroll", this.removeHighlights, { capture: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Diasble the HTML selector tool
|
// Diasble the HTML selector tool
|
||||||
disableHTMLSelector = (ev = undefined) => {
|
disableHTMLSelector = (ev = undefined) => {
|
||||||
|
this.enabledSelector = false;
|
||||||
if (ev) {
|
if (ev) {
|
||||||
if (!ev.isTrusted) {
|
if (!ev.isTrusted) {
|
||||||
return;
|
return;
|
||||||
@@ -636,9 +643,8 @@
|
|||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
}
|
}
|
||||||
this.removeHighlights();
|
this.removeHighlights();
|
||||||
document.removeEventListener("mouseover", this.HTMLSelector, { capture: true });
|
|
||||||
document.removeEventListener("click", this.disableHTMLSelector, { capture: true });
|
document.removeEventListener("click", this.disableHTMLSelector, { capture: true });
|
||||||
document.removeEventListener("mouseout", this.removeHighlights, { capture: true });
|
document.removeEventListener("scroll", this.removeHighlights, { capture: true });
|
||||||
window.top.postMessage({
|
window.top.postMessage({
|
||||||
source: "owl-devtools",
|
source: "owl-devtools",
|
||||||
type: "StopSelector",
|
type: "StopSelector",
|
||||||
@@ -748,7 +754,7 @@
|
|||||||
child.contentType = "object";
|
child.contentType = "object";
|
||||||
child.content = this.serializer.serializeItem(Object.getPrototypeOf(parentObj), true);
|
child.content = this.serializer.serializeItem(Object.getPrototypeOf(parentObj), true);
|
||||||
child.hasChildren = true;
|
child.hasChildren = true;
|
||||||
if (!oldTree && type === "env") {
|
if (!oldTree && type === "env" && Object.getPrototypeOf(parentObj) !== Object.prototype) {
|
||||||
child.toggled = true;
|
child.toggled = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export const IS_FIREFOX = navigator.userAgent.indexOf("Firefox") !== -1;
|
export const IS_FIREFOX = navigator.userAgent.indexOf("Firefox") !== -1;
|
||||||
|
|
||||||
const browserInstance = IS_FIREFOX ? browser : chrome;
|
export const browserInstance = IS_FIREFOX ? browser : chrome;
|
||||||
|
|
||||||
export async function getOwlStatus() {
|
export async function getOwlStatus() {
|
||||||
const response = await browserInstance.runtime.sendMessage({ type: "getOwlStatus" });
|
const response = await browserInstance.runtime.sendMessage({ type: "getOwlStatus" });
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"root": true,
|
||||||
|
"parser": "@typescript-eslint/parser",
|
||||||
|
"parserOptions": {
|
||||||
|
"ecmaVersion": 6,
|
||||||
|
"sourceType": "module"
|
||||||
|
},
|
||||||
|
"plugins": [
|
||||||
|
"@typescript-eslint"
|
||||||
|
],
|
||||||
|
"rules": {
|
||||||
|
"@typescript-eslint/naming-convention": "warn",
|
||||||
|
"@typescript-eslint/semi": "warn",
|
||||||
|
"curly": "warn",
|
||||||
|
"eqeqeq": "warn",
|
||||||
|
"no-throw-literal": "warn",
|
||||||
|
"semi": "off"
|
||||||
|
},
|
||||||
|
"ignorePatterns": [
|
||||||
|
"out",
|
||||||
|
"dist",
|
||||||
|
"**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Run Extension",
|
||||||
|
"type": "extensionHost",
|
||||||
|
"request": "launch",
|
||||||
|
"args": [
|
||||||
|
"--extensionDevelopmentPath=${workspaceFolder}"
|
||||||
|
],
|
||||||
|
"outFiles": [
|
||||||
|
"${workspaceFolder}/out/**/*.js"
|
||||||
|
],
|
||||||
|
"preLaunchTask": "${defaultBuildTask}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Extension Tests",
|
||||||
|
"type": "extensionHost",
|
||||||
|
"request": "launch",
|
||||||
|
"args": [
|
||||||
|
"--extensionDevelopmentPath=${workspaceFolder}",
|
||||||
|
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
|
||||||
|
],
|
||||||
|
"outFiles": [
|
||||||
|
"${workspaceFolder}/out/test/**/*.js"
|
||||||
|
],
|
||||||
|
"preLaunchTask": "${defaultBuildTask}"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "watch",
|
||||||
|
"problemMatcher": "$tsc-watch",
|
||||||
|
"isBackground": true,
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "never"
|
||||||
|
},
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
.vscode/**
|
||||||
|
.vscode-test/**
|
||||||
|
src/**
|
||||||
|
.gitignore
|
||||||
|
.yarnrc
|
||||||
|
vsc-extension-quickstart.md
|
||||||
|
**/tsconfig.json
|
||||||
|
**/.eslintrc.json
|
||||||
|
**/*.map
|
||||||
|
**/*.ts
|
||||||
|
**/*.vsix
|
||||||
|
scripts/**
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# Change Log
|
||||||
|
|
||||||
|
All notable changes to the "owl-vision" extension will be documented in this file.
|
||||||
|
|
||||||
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
|
||||||
|
## [0.1.0] - 2024-11-06
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Basic autocomplete in xml files. This includes autocompletion for elements, components,
|
||||||
|
props, attributes, and javascript expressions.
|
||||||
|
|
||||||
|
The current implementation, while relatively simple, has a couple of drawbacks:
|
||||||
|
- Javascript imports are not resolved by the xml autocomplete, this means that it does not
|
||||||
|
understand the types of imported functions or objects. That said, I've added custom support
|
||||||
|
for frequently used Owl imports, namely `useState` and `useRef`. You can add more in
|
||||||
|
the settings if needed.
|
||||||
|
- The autocomplete is limited to templates directly linked to components, sub-templates
|
||||||
|
used via t-call will not get autocompletion as no component/context can be bound to them.
|
||||||
|
|
||||||
|
- "Go To Definition" support for props and javascript expressions in xml
|
||||||
|
- Support for the following directives: t-att, t-model, t-tag, t-debug, t-log
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Changed t-else syntax highlight from dynamic to static attribute
|
||||||
|
|
||||||
|
## [0.0.2] - 2023-2-11
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Switch Below command
|
||||||
|
- Basic syntax highlight for xpaths
|
||||||
|
- Syntax builder scripts to make syntaxes easier to read and edit
|
||||||
|
- Syntax highlight in single quote attributes
|
||||||
|
- Syntax highlight for slot props
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Added missing space in component's snippet indentation
|
||||||
|
- Using `Switch Besides` or `Switch Below` does not open a new panel if one was already open
|
||||||
|
|
||||||
|
## [0.0.1] - 2023-03-10
|
||||||
|
|
||||||
|
- Initial release
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Owl templates syntax highlight in xml files
|
||||||
|
- `Find Template` Command - Finds the template file of the currently selected element.
|
||||||
|
- `Find Component` Command - Finds the selected component definition.
|
||||||
|
- `Switch` Command - Finds the corresponding template or component file depending on the current file.
|
||||||
|
- `Switch Besides` Command - Finds the corresponding template or component file depending on the current file and opens it besides.
|
||||||
@@ -0,0 +1,856 @@
|
|||||||
|
OWL-VISION is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
|
||||||
|
(LGPLv3), as included below. Since the LGPL is a set of additional
|
||||||
|
permissions on top of the GPL, the text of the GPL is included at the
|
||||||
|
bottom as well.
|
||||||
|
|
||||||
|
Some external libraries and contributions bundled with OWL-VISION may be published
|
||||||
|
under other GPL-compatible licenses. For these, please refer to the relevant
|
||||||
|
source files and/or license files, in the source code tree.
|
||||||
|
|
||||||
|
**************************************************************************
|
||||||
|
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
**************************************************************************
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
|
|
||||||
|
|
||||||
|
**************************************************************************
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# 🦉 Owl Vision 🕶️
|
||||||
|
|
||||||
|
Owl Vision is an extension for the amazing [Owl framework](https://github.com/odoo/owl) that complements your templates with beautiful colors and allows you to more easily navigate between components and templates.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
This extension also adds:
|
||||||
|
- A basic component snippent.
|
||||||
|
- "Go to definition" providers for component tags in xml or in inline templates.
|
||||||
|
|
||||||
|
## Commands
|
||||||
|
|
||||||
|
* `Owl Vision: Find Template`:
|
||||||
|
- If the cursor is on a template name, finds the corresponding template.
|
||||||
|
- If the cursor is on a component, finds the template of the selected component.
|
||||||
|
* `Owl Vision: Find Component`: Finds the selected component definition.
|
||||||
|
* `Owl Vision: Switch`: Finds the corresponding template or component depending on the current file.
|
||||||
|
* `Owl Vision: Switch (Besides)`: Finds the corresponding template or component depending on the current file and opens it besides.
|
||||||
|
* `Owl Vision: Switch (Below)`: Finds the corresponding template or component depending on the current file and opens it below.
|
||||||
|
|
||||||
|
## Settings
|
||||||
|
|
||||||
|
* `owl-vision.include`: Glob filter for files to include while searching.
|
||||||
|
* `owl-vision.exclude`: Glob filter for files to exclude while searching.
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### *The extension cannot find my templates/components*
|
||||||
|
|
||||||
|
The include and exclude settings have default values that may not work with your project structure, try adapting them.
|
||||||
|
After Width: | Height: | Size: 21 KiB |