sync rendering

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 22.x]
+        node-version: [12.x, 14.x, 16.x]
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -15,7 +15,7 @@ yarn-debug.log*
 yarn-error.log*
 
 #ide's
-**/.vscode/*
+.vscode
 .idea
 
 node_modules
@@ -26,10 +26,3 @@ release-notes.md
 
 # useful in some cases
 /temp
-
-# owl-vision
-*/owl-vision/out/
-*/owl-vision/.vs/
-**/*.vsix
-!*/owl-vision/.vscode/launch.json
-!*/owl-vision/.vscode/tasks.json

doc/readme.md

@@ -47,4 +47,3 @@ Utility/helpers:
 - [`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
 - [`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

doc/reference/app.md

@@ -6,7 +6,6 @@
 - [API](#api)
 - [Configuration](#configuration)
 - [`mount` helper](#mount-helper)
-- [Roots](#roots)
 - [Loading templates](#loading-templates)
 
 ## Overview
@@ -62,8 +61,6 @@ The `config` object is an object with some of the following keys:
   templates (see [translations](translations.md))
 - **`templates (string | xml document)`**: all the templates that will be used by
   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
   whenever it encounters a component that does not provide a [static props description](props.md#props-validation).
 
@@ -93,33 +90,6 @@ Most of the time, the `mount` helper is more convenient, but whenever one needs
 a reference to the actual Owl App, then using the `App` class directly is
 possible.
 
-## Roots
-
-An application can have multiple roots. It is sometimes useful to instantiate
-sub components in places that are not managed by Owl, such as an html editor
-with dynamic content (the Knowledge application in Odoo).
-
-To create a root, one can use the `createRoot` method, which takes two arguments:
-
-- **`Component`**: a component class (Root component of the app)
-- **`config (optional)`**: a config object that may contain a `props` object or a
-  `env` object.
-
-The `createRoot` method returns an object with a `mount` method (same API as
-the `App.mount` method), and a `destroy` method.
-
-```js
-const root = app.createRoot(MyComponent, { props: { someProps: true } });
-await root.mount(targetElement);
-
-// later
-root.destroy();
-```
-
-Note that, like with owl `App`, it is the responsibility of the code that created
-the root to properly destroy it (before it has been removed from the DOM!). Owl
-has no way of doing it itself.
-
 ## Loading templates
 
 Most applications will need to load templates whenever they start. Here is

doc/reference/component.md

@@ -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
 called.
 
-The `onWillDestroy` hook is used to register a function that will be executed at
+The `onWillUnmount` hook is used to register a function that will be executed at
 this moment:
 
 ```javascript

doc/reference/error_handling.md

@@ -51,8 +51,8 @@ that render its content, and a fallback if an error happened.
 ```js
 class ErrorBoundary extends Component {
   static template = xml`
-    <t t-if="state.error" t-slot="fallback">An error occurred</t>
-    <t t-else="" t-slot="default"/>`;
+    <t t-if="error" t-slot="fallback">An error occurred</t>
+    <t t-else="" t-slot="content"`;
 
   setup() {
     this.state = useState({ error: false });

doc/reference/hooks.md

@@ -190,13 +190,12 @@ will then be updated accordingly.
 ### `useExternalListener`
 
 The `useExternalListener` hook helps solve a very common problem: adding and removing
-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 listener on some target whenever a component is mounted/unmounted. For example,
 a dropdown menu (or its parent) may need to listen to a `click` event on `window`
 to be closed:
 
 ```js
-useExternalListener(window, "click", this.closeMenu, { capture: true });
+useExternalListener(window, "click", this.closeMenu);
 ```
 
 ### `useComponent`

doc/reference/props.md

@@ -140,28 +140,6 @@ class SomeComponent extends Component {
 The `.bind` suffix also implies `.alike`, so these props will not cause additional
 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
 
 The `t-props` directive can be used to specify totally dynamic props:
@@ -260,7 +238,7 @@ class ComponentB extends owl.Component {
     count: {type: Number},
     messages: {
       type: Array,
-      element: {type: Object, shape: {id: Boolean, text: String }}
+      element: {type: Object, shape: {id: Boolean, text: String }
     },
    date: Date,
    combinedVal: [Number, Boolean],
@@ -298,8 +276,7 @@ class ComponentB extends owl.Component {
         id: Number,
         name: {type: String, optional: true},
         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: {
       type: Object,
       values: { type: Array, element: String },

doc/reference/reactivity.md

@@ -152,7 +152,7 @@ This may seem counter-intuitive, but it makes perfect sense in the context of co
 ```js
 class DoubleCounter extends Component {
   static template = xml`
-    <t t-esc="'selected: ' + state.selected + ', value: ' + state[state.selected]"/>
+    <t t-esc="state.selected + ': ' + state[state.selected].value"/>
     <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="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`
 
 Marks an object so that it is ignored by the reactivity system, meaning that if this object is ever
-part of a reactive object, it will be returned as is, and no keys in that object will be
+part of a of a reactive object, it will be returned as is, and no keys in that object will be
 observed.
 
 ```js

doc/reference/slots.md

@@ -133,7 +133,7 @@ Slots can define a default content, in case the parent did not define them:
 ## Dynamic Slots
 
 The `t-slot` directive is actually able to use any expressions, using string
-interpolation:
+interplolation:
 
 ```xml
  <t t-slot="{{current}}" />
@@ -201,17 +201,16 @@ use this `Notebook` component:
 
 ```xml
 <Notebook>
-  <t t-set-slot="page1" title.translate="Page 1">
+  <t t-set-slot="page1" title="'Page 1'">
     <div>this is in the page 1</div>
   </t>
-  <t t-set-slot="page2" title.translate="Page 2" hidden="somevalue">
+  <t t-set-slot="page2" title="'Page 2'" hidden="somevalue">
     <div>this is in the page 2</div>
   </t>
 </Notebook>
 ```
 
-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
+Slot params works like normal props, so one can use the `.bind` suffix to
 bind a function if needed.
 
 ## Slot scopes

doc/reference/utils.md

@@ -9,7 +9,6 @@ functions are all available in the `owl.utils` namespace.
 - [`loadFile`](#loadfile): loading a file (useful for templates)
 - [`EventBus`](#eventbus): a simple EventBus
 - [`validate`](#validate): a validation function
-- [`batched`](#batched): batch function calls
 
 ## `whenReady`
 
@@ -79,22 +78,3 @@ validate(
 //    - 'id' is missing (should be a number),
 //    - '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
-```

doc/tools/devtools_guide.md

@@ -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
 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
-one. There can also be multiple apps loaded in the page like in website:
+one. There can also be multiple apps loaded in the page like in the following:
 
 <img src="screenshots/multi_apps.png"/>
 
 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 component you want to focus on in the page which is especially useful when 1trying to find
+the component you want to focus on in the page which is especially useful when trying to find
 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
 page in this mode will highlight it and the same happens anytime in the components tree.
@@ -64,18 +64,25 @@ 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
 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 being observed by the component:
-when any property of a reactive object is being read by the component, the component will subscribe
-to this property which means it will listen to any change that can occur on the property and render
-when such a change occurs. This can be visualized easily within the devtools inside of the observed
-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:
+The observed state is actually information about which variables are observed by the component
+which will trigger a rerender of the component when it is modified. The keys represent which part of the
+variable is actually observed and the target is the actual variable. For simplicity, the properties
+that are not observed by the component are greyed out while the others are in bold. This means that
+editing bold ones will trigger a rerender while the greyed out ones will not.
 
 <img src="screenshots/states.png"/>
 
-Navigation inside the properties is also similar to the one in console variables: properties have
+In the given example, we have two keys/target pairs for two different variables. The first one indicates
+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
 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.
@@ -89,10 +96,8 @@ 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
 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:
-89, "yes", undefined, null, \["hello", 15\], {"a": 1}, true, ...). Editing any value will produce a
-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.
+89, "yes", undefined, null, \["hello", 15\], {"a": 1}, true, ...). Whether it 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"/>
 
@@ -112,8 +117,7 @@ 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
 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,
-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.
+update and destroy events which reveals the component that initiated the event.
 
 <img src="screenshots/events_log.png"/>
 
@@ -127,29 +131,20 @@ 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
 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
-of the modification.
+of the modification
 
 <img src="screenshots/trace_rendering.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
 
 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. There is also a refresh button to
-completely reset the owl devtools.
+be toggled using the sun/moon icon at the top-right corner of the tab. All the examples above were created
+with the dark mode enabled. There is also a refresh button to completely reset the owl devtools.
 
 <img src="screenshots/darkmode.png"/>
 
 ## Troubleshooting
 
-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.
+If the feedback from the page to the devtools seems to be cut, just close the devtools and refresh the page.
 This will eventually happen any time a tab stays opened for too long without being refreshed.

docs/owl.js

@@ -1850,9 +1850,8 @@ const NO_CALLBACK = () => {
 };
 const objectToString = Object.prototype.toString;
 const objectHasOwnProperty = Object.prototype.hasOwnProperty;
-// Use arrays because Array.includes is faster than Set.has for small arrays
-const SUPPORTED_RAW_TYPES = ["Object", "Array", "Set", "Map", "WeakMap"];
-const COLLECTION_RAW_TYPES = ["Set", "Map", "WeakMap"];
+const SUPPORTED_RAW_TYPES = new Set(["Object", "Array", "Set", "Map", "WeakMap"]);
+const COLLECTION_RAWTYPES = new Set(["Set", "Map", "WeakMap"]);
 /**
  * extract "RawType" from strings like "[object RawType]" => this lets us ignore
  * many native objects such as Promise (whose toString is [object Promise])
@@ -1875,7 +1874,7 @@ function canBeMadeReactive(value) {
     if (typeof value !== "object") {
         return false;
     }
-    return SUPPORTED_RAW_TYPES.includes(rawType(value));
+    return SUPPORTED_RAW_TYPES.has(rawType(value));
 }
 /**
  * Creates a reactive from the given object/callback if possible and returns it,
@@ -2045,7 +2044,7 @@ function reactive(target, callback = NO_CALLBACK) {
     const reactivesForTarget = reactiveCache.get(target);
     if (!reactivesForTarget.has(callback)) {
         const targetRawType = rawType(target);
-        const handler = COLLECTION_RAW_TYPES.includes(targetRawType)
+        const handler = COLLECTION_RAWTYPES.has(targetRawType)
             ? collectionsProxyHandler(target, callback, targetRawType)
             : basicProxyHandler(callback);
         const proxy = new Proxy(target, handler);
@@ -2074,7 +2073,7 @@ function basicProxyHandler(callback) {
         set(target, key, value, receiver) {
             const hadKey = objectHasOwnProperty.call(target, key);
             const originalValue = Reflect.get(target, key, receiver);
-            const ret = Reflect.set(target, key, toRaw(value), receiver);
+            const ret = Reflect.set(target, key, value, receiver);
             if (!hadKey && objectHasOwnProperty.call(target, key)) {
                 notifyReactives(target, KEYCHANGES);
             }
@@ -2598,47 +2597,42 @@ class ComponentNode {
 }
 
 const TIMEOUT = Symbol("timeout");
-const HOOK_TIMEOUT = {
-    onWillStart: 3000,
-    onWillUpdateProps: 3000,
-};
 function wrapError(fn, hookName) {
-    const error = new OwlError();
-    const timeoutError = new OwlError();
+    const error = new OwlError(`The following error occurred in ${hookName}: `);
+    const timeoutError = new OwlError(`${hookName}'s promise hasn't resolved after 3 seconds`);
     const node = getCurrent();
     return (...args) => {
         const onError = (cause) => {
             error.cause = cause;
-            error.message =
-                cause instanceof Error
-                    ? `The following error occurred in ${hookName}: "${cause.message}"`
-                    : `Something that is not an Error was thrown in ${hookName} (see this Error's "cause" property)`;
+            if (cause instanceof Error) {
+                error.message += `"${cause.message}"`;
+            }
+            else {
+                error.message = `Something that is not an Error was thrown in ${hookName} (see this Error's "cause" property)`;
+            }
             throw error;
         };
-        let result;
         try {
-            result = fn(...args);
+            const result = fn(...args);
+            if (result instanceof Promise) {
+                if (hookName === "onWillStart" || hookName === "onWillUpdateProps") {
+                    const fiber = node.fiber;
+                    Promise.race([
+                        result.catch(() => { }),
+                        new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
+                    ]).then((res) => {
+                        if (res === TIMEOUT && node.fiber === fiber) {
+                            console.warn(timeoutError);
+                        }
+                    });
+                }
+                return result.catch(onError);
+            }
+            return result;
         }
         catch (cause) {
             onError(cause);
         }
-        if (!(result instanceof Promise)) {
-            return result;
-        }
-        const timeout = HOOK_TIMEOUT[hookName];
-        if (timeout) {
-            const fiber = node.fiber;
-            Promise.race([
-                result.catch(() => { }),
-                new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), timeout)),
-            ]).then((res) => {
-                if (res === TIMEOUT && node.fiber === fiber && node.status <= 2) {
-                    timeoutError.message = `${hookName}'s promise hasn't resolved after ${timeout / 1000} seconds`;
-                    console.log(timeoutError);
-                }
-            });
-        }
-        return result.catch(onError);
     };
 }
 // -----------------------------------------------------------------------------
@@ -3165,14 +3159,8 @@ const helpers = {
     makeRefWrapper,
 };
 
-/**
- * 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 bdom = { text, createBlock, list, multi, html, toggler, comment };
+function parseXML$1(xml) {
     const parser = new DOMParser();
     const doc = parser.parseFromString(xml, "text/xml");
     if (doc.getElementsByTagName("parsererror").length) {
@@ -3199,9 +3187,7 @@ function parseXML(xml) {
         throw new OwlError(msg);
     }
     return doc;
-}
-
-const bdom = { text, createBlock, list, multi, html, toggler, comment };
+}
 class TemplateSet {
     constructor(config = {}) {
         this.rawTemplates = Object.create(globalTemplates);
@@ -3211,16 +3197,8 @@ class TemplateSet {
         this.translateFn = config.translateFn;
         this.translatableAttributes = config.translatableAttributes;
         if (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.addTemplates(config.templates);
         }
-        this.getRawTemplate = config.getTemplate;
     }
     static registerTemplate(name, fn) {
         globalTemplates[name] = fn;
@@ -3250,16 +3228,15 @@ class TemplateSet {
             // empty string
             return;
         }
-        xml = xml instanceof Document ? xml : parseXML(xml);
+        xml = xml instanceof Document ? xml : parseXML$1(xml);
         for (const template of xml.querySelectorAll("[t-name]")) {
             const name = template.getAttribute("t-name");
             this.addTemplate(name, template);
         }
     }
     getTemplate(name) {
-        var _a;
         if (!(name in this.templates)) {
-            const rawTemplate = ((_a = this.getRawTemplate) === null || _a === void 0 ? void 0 : _a.call(this, name)) || this.rawTemplates[name];
+            const rawTemplate = this.rawTemplates[name];
             if (rawTemplate === undefined) {
                 let extraInfo = "";
                 try {
@@ -3517,7 +3494,7 @@ function compileExprToArray(expr) {
     const localVars = new Set();
     const tokens = tokenize(expr);
     let i = 0;
-    let stack = []; // to track last opening (, [ or {
+    let stack = []; // to track last opening [ or {
     while (i < tokens.length) {
         let token = tokens[i];
         let prevToken = tokens[i - 1];
@@ -3526,12 +3503,10 @@ function compileExprToArray(expr) {
         switch (token.type) {
             case "LEFT_BRACE":
             case "LEFT_BRACKET":
-            case "LEFT_PAREN":
                 stack.push(token.type);
                 break;
             case "RIGHT_BRACE":
             case "RIGHT_BRACKET":
-            case "RIGHT_PAREN":
                 stack.pop();
         }
         let isVar = token.type === "SYMBOL" && !RESERVED_WORDS.includes(token.value);
@@ -3643,13 +3618,6 @@ function isProp(tag, key) {
     }
     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
 // -----------------------------------------------------------------------------
@@ -3830,14 +3798,15 @@ class CodeGenerator {
             mainCode.push(``);
             for (let block of this.blocks) {
                 if (block.dom) {
-                    let xmlString = toStringExpression(block.asXmlString());
+                    let xmlString = block.asXmlString();
+                    xmlString = xmlString.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
                     if (block.dynamicTagName) {
-                        xmlString = xmlString.replace(/^`<\w+/, `\`<\${tag || '${block.dom.nodeName}'}`);
-                        xmlString = xmlString.replace(/\w+>`$/, `\${tag || '${block.dom.nodeName}'}>\``);
-                        mainCode.push(`let ${block.blockName} = tag => createBlock(${xmlString});`);
+                        xmlString = xmlString.replace(/^<\w+/, `<\${tag || '${block.dom.nodeName}'}`);
+                        xmlString = xmlString.replace(/\w+>$/, `\${tag || '${block.dom.nodeName}'}>`);
+                        mainCode.push(`let ${block.blockName} = tag => createBlock(\`${xmlString}\`);`);
                     }
                     else {
-                        mainCode.push(`let ${block.blockName} = createBlock(${xmlString});`);
+                        mainCode.push(`let ${block.blockName} = createBlock(\`${xmlString}\`);`);
                     }
                 }
             }
@@ -4015,7 +3984,7 @@ class CodeGenerator {
         const isNewBlock = !block || forceNewBlock;
         if (isNewBlock) {
             block = this.createBlock(block, "comment", ctx);
-            this.insertBlock(`comment(${toStringExpression(ast.value)})`, block, {
+            this.insertBlock(`comment(\`${ast.value}\`)`, block, {
                 ...ctx,
                 forceNewBlock: forceNewBlock && !block,
             });
@@ -4037,7 +4006,7 @@ class CodeGenerator {
         }
         if (!block || forceNewBlock) {
             block = this.createBlock(block, "text", ctx);
-            this.insertBlock(`text(${toStringExpression(value)})`, block, {
+            this.insertBlock(`text(\`${value}\`)`, block, {
                 ...ctx,
                 forceNewBlock: forceNewBlock && !block,
             });
@@ -4258,8 +4227,7 @@ class CodeGenerator {
             expr = compileExpr(ast.expr);
             if (ast.defaultValue) {
                 this.helpers.add("withDefault");
-                // FIXME: defaultValue is not translated
-                expr = `withDefault(${expr}, ${toStringExpression(ast.defaultValue)})`;
+                expr = `withDefault(${expr}, \`${ast.defaultValue}\`)`;
             }
         }
         if (!block || forceNewBlock) {
@@ -4512,7 +4480,7 @@ class CodeGenerator {
                 this.addLine(`${ctxVar}[zero] = ${bl};`);
             }
         }
-        const key = this.generateComponentKey();
+        const key = `key + \`${this.generateComponentKey()}\``;
         if (isDynamic) {
             const templateVar = generateId("template");
             if (!this.staticDefs.find((d) => d.id === "call")) {
@@ -4564,12 +4532,12 @@ class CodeGenerator {
         else {
             let value;
             if (ast.defaultValue) {
-                const defaultValue = toStringExpression(ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue);
+                const defaultValue = ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue;
                 if (ast.value) {
-                    value = `withDefault(${expr}, ${defaultValue})`;
+                    value = `withDefault(${expr}, \`${defaultValue}\`)`;
                 }
                 else {
-                    value = defaultValue;
+                    value = `\`${defaultValue}\``;
                 }
             }
             else {
@@ -4580,12 +4548,12 @@ class CodeGenerator {
         }
         return null;
     }
-    generateComponentKey(currentKey = "key") {
+    generateComponentKey() {
         const parts = [generateId("__")];
         for (let i = 0; i < this.target.loopLevel; i++) {
             parts.push(`\${key${i + 1}}`);
         }
-        return `${currentKey} + \`${parts.join("__")}\``;
+        return parts.join("__");
     }
     /**
      * Formats a prop name and value into a string suitable to be inserted in the
@@ -4599,12 +4567,7 @@ class CodeGenerator {
      * "onClick.bind"    "onClick"        "onClick: bind(ctx, ctx['onClick'])"
      */
     formatProp(name, value) {
-        if (name.endsWith(".translate")) {
-            value = toStringExpression(this.translateFn(value));
-        }
-        else {
-            value = this.captureExpression(value);
-        }
+        value = this.captureExpression(value);
         if (name.includes(".")) {
             let [_name, suffix] = name.split(".");
             name = _name;
@@ -4613,7 +4576,6 @@ class CodeGenerator {
                     value = `(${value}).bind(this)`;
                     break;
                 case "alike":
-                case "translate":
                     break;
                 default:
                     throw new OwlError("Invalid prop suffix");
@@ -4682,6 +4644,7 @@ class CodeGenerator {
             this.addLine(`${propVar}.slots = markRaw(Object.assign(${slotDef}, ${propVar}.slots))`);
         }
         // cmap key
+        const key = this.generateComponentKey();
         let expr;
         if (ast.isDynamic) {
             expr = generateId("Comp");
@@ -4697,7 +4660,7 @@ class CodeGenerator {
             // todo: check the forcenewblock condition
             this.insertAnchor(block);
         }
-        let keyArg = this.generateComponentKey();
+        let keyArg = `key + \`${key}\``;
         if (ctx.tKeyExpr) {
             keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
         }
@@ -4770,7 +4733,7 @@ class CodeGenerator {
         }
         let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
         if (isMultiple) {
-            key = this.generateComponentKey(key);
+            key = `${key} + \`${this.generateComponentKey()}\``;
         }
         const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
         const scope = this.getPropString(props, dynProps);
@@ -4811,6 +4774,7 @@ class CodeGenerator {
         }
         let { block } = ctx;
         const name = this.compileInNewTarget("slot", ast.content, ctx);
+        const key = this.generateComponentKey();
         let ctxStr = "ctx";
         if (this.target.loopLevel || !this.hasSafeContext) {
             ctxStr = generateId("ctx");
@@ -4823,8 +4787,7 @@ class CodeGenerator {
             expr: `app.createComponent(null, false, true, false, false)`,
         });
         const target = compileExpr(ast.target);
-        const key = this.generateComponentKey();
-        const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, ${key}, node, ctx, Portal)`;
+        const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, key + \`${key}\`, node, ctx, Portal)`;
         if (block) {
             this.insertAnchor(block);
         }
@@ -4983,9 +4946,9 @@ function parseDOMNode(node, ctx) {
             const isSelect = tagName === "select";
             const isCheckboxInput = isInput && typeAttr === "checkbox";
             const isRadioInput = isInput && typeAttr === "radio";
-            const hasTrimMod = attr.includes(".trim");
-            const hasLazyMod = hasTrimMod || attr.includes(".lazy");
+            const hasLazyMod = attr.includes(".lazy");
             const hasNumberMod = attr.includes(".number");
+            const hasTrimMod = attr.includes(".trim");
             const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
             model = {
                 baseExpr,
@@ -5316,14 +5279,14 @@ function parseComponent(node, ctx) {
             // be ignored)
             let el = slotNode.parentElement;
             let isInSubComponent = false;
-            while (el && el !== clone) {
+            while (el !== clone) {
                 if (el.hasAttribute("t-component") || el.tagName[0] === el.tagName[0].toUpperCase()) {
                     isInSubComponent = true;
                     break;
                 }
                 el = el.parentElement;
             }
-            if (isInSubComponent || !el) {
+            if (isInSubComponent) {
                 continue;
             }
             slotNode.removeAttribute("t-set-slot");
@@ -5531,6 +5494,41 @@ function normalizeTEscTOut(el) {
 function normalizeXML(el) {
     normalizeTIf(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 = {}) {
@@ -5557,7 +5555,7 @@ function compile(template, options = {}) {
 }
 
 // do not modify manually. This file is generated by the release script.
-const version = "2.4.0";
+const version = "2.2.6";
 
 // -----------------------------------------------------------------------------
 //  Scheduler
@@ -5652,7 +5650,6 @@ class App extends TemplateSet {
     constructor(Root, config = {}) {
         super(config);
         this.scheduler = new Scheduler();
-        this.subRoots = new Set();
         this.root = null;
         this.name = config.name || "";
         this.Root = Root;
@@ -5671,42 +5668,14 @@ class App extends TemplateSet {
         this.props = config.props || {};
     }
     mount(target, options) {
-        const root = this.createRoot(this.Root, { props: this.props });
-        this.root = root.node;
-        this.subRoots.delete(root.node);
-        return root.mount(target, options);
-    }
-    createRoot(Root, config = {}) {
-        const props = config.props || {};
-        // hack to make sure the sub root get the sub env if necessary. for owl 3,
-        // would be nice to rethink the initialization process to make sure that
-        // we can create a ComponentNode and give it explicitely the env, instead
-        // of looking it up in the app
-        const env = this.env;
-        if (config.env) {
-            this.env = config.env;
+        App.validateTarget(target);
+        if (this.dev) {
+            validateProps(this.Root, this.props, { __owl__: { app: this } });
         }
-        const node = this.makeNode(Root, props);
-        if (config.env) {
-            this.env = env;
-        }
-        this.subRoots.add(node);
-        return {
-            node,
-            mount: (target, options) => {
-                App.validateTarget(target);
-                if (this.dev) {
-                    validateProps(Root, props, { __owl__: { app: this } });
-                }
-                const prom = this.mountNode(node, target, options);
-                return prom;
-            },
-            destroy: () => {
-                this.subRoots.delete(node);
-                node.destroy();
-                this.scheduler.processTasks();
-            },
-        };
+        const node = this.makeNode(this.Root, this.props);
+        const prom = this.mountNode(node, target, options);
+        this.root = node;
+        return prom;
     }
     makeNode(Component, props) {
         return new ComponentNode(Component, props, this, null, null);
@@ -5738,9 +5707,6 @@ class App extends TemplateSet {
     }
     destroy() {
         if (this.root) {
-            for (let subroot of this.subRoots) {
-                subroot.destroy();
-            }
             this.root.destroy();
             this.scheduler.processTasks();
         }
@@ -5936,7 +5902,7 @@ function useChildSubEnv(envExtension) {
  *
  * @template T
  * @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
  *      run again. If the dependencies did not change, the effect will not run
  *      again. The default value returns an array containing only NaN because
@@ -6015,9 +5981,9 @@ TemplateSet.prototype._compileTemplate = function _compileTemplate(name, templat
     });
 };
 
-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 };
+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 };
 
 
-__info__.date = '2024-09-30T08:49:29.420Z';
-__info__.hash = 'eb2b32a';
+__info__.date = '2023-09-25T11:48:01.531Z';
+__info__.hash = '752160f';
 __info__.url = 'https://github.com/odoo/owl';

docs/playground/playground.js

@@ -41,6 +41,9 @@ const loadFile = (path) => {
  * Make an iframe, with all the js, css and xml properly injected.
  */
 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");
   iframe.onload = () => {
     const doc = iframe.contentDocument;
@@ -52,8 +55,6 @@ function makeCodeIframe(js, css, xml) {
 
     const script = doc.createElement("script");
     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}`;
     doc.body.appendChild(script);
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@odoo/owl",
-  "version": "2.4.0",
+  "version": "2.2.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odoo/owl",
-  "version": "2.4.0",
+  "version": "2.2.6",
   "description": "Odoo Web Library (OWL)",
   "main": "dist/owl.cjs.js",
   "module": "dist/owl.es.js",
@@ -9,7 +9,7 @@
     "dist"
   ],
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=12.18.3"
   },
   "scripts": {
     "build:bundle": "rollup -c --failAfterWarnings",

src/common/utils.ts

@@ -1,38 +0,0 @@
-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;
-}

src/compiler/code_generator.ts

@@ -4,7 +4,7 @@ import {
   interpolate,
   INTERP_REGEXP,
   replaceDynamicParts,
-} from "../common/inline_expressions";
+} from "./inline_expressions";
 import {
   AST,
   ASTComment,
@@ -82,14 +82,6 @@ function isProp(tag: string, key: string): boolean {
   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
 // -----------------------------------------------------------------------------
@@ -319,13 +311,14 @@ export class CodeGenerator {
       mainCode.push(``);
       for (let block of this.blocks) {
         if (block.dom) {
-          let xmlString = toStringExpression(block.asXmlString());
+          let xmlString = block.asXmlString();
+          xmlString = xmlString.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
           if (block.dynamicTagName) {
-            xmlString = xmlString.replace(/^`<\w+/, `\`<\${tag || '${block.dom.nodeName}'}`);
-            xmlString = xmlString.replace(/\w+>`$/, `\${tag || '${block.dom.nodeName}'}>\``);
-            mainCode.push(`let ${block.blockName} = tag => createBlock(${xmlString});`);
+            xmlString = xmlString.replace(/^<\w+/, `<\${tag || '${block.dom.nodeName}'}`);
+            xmlString = xmlString.replace(/\w+>$/, `\${tag || '${block.dom.nodeName}'}>`);
+            mainCode.push(`let ${block.blockName} = tag => createBlock(\`${xmlString}\`);`);
           } else {
-            mainCode.push(`let ${block.blockName} = createBlock(${xmlString});`);
+            mainCode.push(`let ${block.blockName} = createBlock(\`${xmlString}\`);`);
           }
         }
       }
@@ -522,7 +515,7 @@ export class CodeGenerator {
     const isNewBlock = !block || forceNewBlock;
     if (isNewBlock) {
       block = this.createBlock(block, "comment", ctx);
-      this.insertBlock(`comment(${toStringExpression(ast.value)})`, block, {
+      this.insertBlock(`comment(\`${ast.value}\`)`, block, {
         ...ctx,
         forceNewBlock: forceNewBlock && !block,
       });
@@ -546,7 +539,7 @@ export class CodeGenerator {
 
     if (!block || forceNewBlock) {
       block = this.createBlock(block, "text", ctx);
-      this.insertBlock(`text(${toStringExpression(value)})`, block, {
+      this.insertBlock(`text(\`${value}\`)`, block, {
         ...ctx,
         forceNewBlock: forceNewBlock && !block,
       });
@@ -781,8 +774,7 @@ export class CodeGenerator {
       expr = compileExpr(ast.expr);
       if (ast.defaultValue) {
         this.helpers.add("withDefault");
-        // FIXME: defaultValue is not translated
-        expr = `withDefault(${expr}, ${toStringExpression(ast.defaultValue)})`;
+        expr = `withDefault(${expr}, \`${ast.defaultValue}\`)`;
       }
     }
     if (!block || forceNewBlock) {
@@ -1047,7 +1039,7 @@ export class CodeGenerator {
       }
     }
 
-    const key = this.generateComponentKey();
+    const key = `key + \`${this.generateComponentKey()}\``;
     if (isDynamic) {
       const templateVar = generateId("template");
       if (!this.staticDefs.find((d) => d.id === "call")) {
@@ -1099,13 +1091,11 @@ export class CodeGenerator {
     } else {
       let value: string;
       if (ast.defaultValue) {
-        const defaultValue = toStringExpression(
-          ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue
-        );
+        const defaultValue = ctx.translate ? this.translate(ast.defaultValue) : ast.defaultValue;
         if (ast.value) {
-          value = `withDefault(${expr}, ${defaultValue})`;
+          value = `withDefault(${expr}, \`${defaultValue}\`)`;
         } else {
-          value = defaultValue;
+          value = `\`${defaultValue}\``;
         }
       } else {
         value = expr;
@@ -1116,12 +1106,12 @@ export class CodeGenerator {
     return null;
   }
 
-  generateComponentKey(currentKey: string = "key") {
+  generateComponentKey() {
     const parts = [generateId("__")];
     for (let i = 0; i < this.target.loopLevel; i++) {
       parts.push(`\${key${i + 1}}`);
     }
-    return `${currentKey} + \`${parts.join("__")}\``;
+    return parts.join("__");
   }
 
   /**
@@ -1136,11 +1126,7 @@ export class CodeGenerator {
    * "onClick.bind"    "onClick"        "onClick: bind(ctx, ctx['onClick'])"
    */
   formatProp(name: string, value: string): string {
-    if (name.endsWith(".translate")) {
-      value = toStringExpression(this.translateFn(value));
-    } else {
-      value = this.captureExpression(value);
-    }
+    value = this.captureExpression(value);
     if (name.includes(".")) {
       let [_name, suffix] = name.split(".");
       name = _name;
@@ -1149,7 +1135,6 @@ export class CodeGenerator {
           value = `(${value}).bind(this)`;
           break;
         case "alike":
-        case "translate":
           break;
         default:
           throw new OwlError("Invalid prop suffix");
@@ -1229,6 +1214,7 @@ export class CodeGenerator {
     }
 
     // cmap key
+    const key = this.generateComponentKey();
     let expr: string;
     if (ast.isDynamic) {
       expr = generateId("Comp");
@@ -1246,7 +1232,7 @@ export class CodeGenerator {
       this.insertAnchor(block);
     }
 
-    let keyArg = this.generateComponentKey();
+    let keyArg = `key + \`${key}\``;
     if (ctx.tKeyExpr) {
       keyArg = `${ctx.tKeyExpr} + ${keyArg}`;
     }
@@ -1325,7 +1311,7 @@ export class CodeGenerator {
     }
     let key = this.target.loopLevel ? `key${this.target.loopLevel}` : "key";
     if (isMultiple) {
-      key = this.generateComponentKey(key);
+      key = `${key} + \`${this.generateComponentKey()}\``;
     }
 
     const props = ast.attrs ? this.formatPropObject(ast.attrs) : [];
@@ -1368,6 +1354,7 @@ export class CodeGenerator {
 
     let { block } = ctx;
     const name = this.compileInNewTarget("slot", ast.content, ctx);
+    const key = this.generateComponentKey();
     let ctxStr = "ctx";
     if (this.target.loopLevel || !this.hasSafeContext) {
       ctxStr = generateId("ctx");
@@ -1381,8 +1368,7 @@ export class CodeGenerator {
     });
 
     const target = compileExpr(ast.target);
-    const key = this.generateComponentKey();
-    const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, ${key}, node, ctx, Portal)`;
+    const blockString = `${id}({target: ${target},slots: {'default': {__render: ${name}.bind(this), __ctx: ${ctxStr}}}}, key + \`${key}\`, node, ctx, Portal)`;
     if (block) {
       this.insertAnchor(block);
     }

src/compiler/inline_expressions.ts

@@ -1,4 +1,4 @@
-import { OwlError } from "./owl_error";
+import { OwlError } from "../common/owl_error";
 
 /**
  * Owl QWeb Expression Parser
@@ -268,7 +268,7 @@ export function compileExprToArray(expr: string): Token[] {
   const localVars = new Set<string>();
   const tokens = tokenize(expr);
   let i = 0;
-  let stack = []; // to track last opening (, [ or {
+  let stack = []; // to track last opening [ or {
 
   while (i < tokens.length) {
     let token = tokens[i];
@@ -279,12 +279,10 @@ export function compileExprToArray(expr: string): Token[] {
     switch (token.type) {
       case "LEFT_BRACE":
       case "LEFT_BRACKET":
-      case "LEFT_PAREN":
         stack.push(token.type);
         break;
       case "RIGHT_BRACE":
       case "RIGHT_BRACKET":
-      case "RIGHT_PAREN":
         stack.pop();
     }
 

src/compiler/parser.ts

@@ -1,5 +1,4 @@
 import { OwlError } from "../common/owl_error";
-import { parseXML } from "../common/utils";
 
 // -----------------------------------------------------------------------------
 // AST Type definition
@@ -367,9 +366,9 @@ function parseDOMNode(node: Element, ctx: ParsingContext): AST | null {
       const isSelect = tagName === "select";
       const isCheckboxInput = isInput && typeAttr === "checkbox";
       const isRadioInput = isInput && typeAttr === "radio";
-      const hasTrimMod = attr.includes(".trim");
-      const hasLazyMod = hasTrimMod || attr.includes(".lazy");
+      const hasLazyMod = attr.includes(".lazy");
       const hasNumberMod = attr.includes(".number");
+      const hasTrimMod = attr.includes(".trim");
       const eventType = isRadioInput ? "click" : isSelect || hasLazyMod ? "change" : "input";
 
       model = {
@@ -741,14 +740,14 @@ function parseComponent(node: Element, ctx: ParsingContext): AST | null {
       // be ignored)
       let el = slotNode.parentElement!;
       let isInSubComponent = false;
-      while (el && el !== clone) {
+      while (el !== clone) {
         if (el!.hasAttribute("t-component") || el!.tagName[0] === el!.tagName[0].toUpperCase()) {
           isInSubComponent = true;
           break;
         }
         el = el.parentElement!;
       }
-      if (isInSubComponent || !el) {
+      if (isInSubComponent) {
         continue;
       }
 
@@ -973,3 +972,40 @@ function normalizeXML(el: Element) {
   normalizeTIf(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;
+}

src/runtime/app.ts

@@ -1,14 +1,14 @@
-import { OwlError } from "../common/owl_error";
 import { version } from "../version";
 import { Component, ComponentConstructor, Props } from "./component";
-import { ComponentNode, saveCurrent } from "./component_node";
-import { handleError, nodeErrorHandlers } from "./error_handling";
-import { Fiber, MountOptions, RootFiber } from "./fibers";
-import { reactive, toRaw } from "./reactivity";
+import { ComponentNode } from "./component_node";
+import { nodeErrorHandlers, handleError } from "./error_handling";
+import { OwlError } from "../common/owl_error";
+import { Fiber, RootFiber, MountOptions } from "./fibers";
 import { Scheduler } from "./scheduler";
 import { validateProps } from "./template_helpers";
 import { TemplateSet, TemplateSetConfig } from "./template_set";
 import { validateTarget } from "./utils";
+import { toRaw, reactive } from "./reactivity";
 
 // reimplement dev mode stuff see last change in 0f7a8289a6fb8387c3c1af41c6664b2a8448758f
 
@@ -16,13 +16,10 @@ export interface Env {
   [key: string]: any;
 }
 
-export interface RootConfig<P, E> {
+export interface AppConfig<P, E> extends TemplateSetConfig {
+  name?: string;
   props?: P;
   env?: E;
-}
-
-export interface AppConfig<P, E> extends TemplateSetConfig, RootConfig<P, E> {
-  name?: string;
   test?: boolean;
   warnIfNoStaticProps?: boolean;
 }
@@ -52,12 +49,6 @@ declare global {
   }
 }
 
-interface Root<P extends Props, E> {
-  node: ComponentNode<P, E> | null;
-  mount(target: HTMLElement | ShadowRoot, options?: MountOptions): Promise<Component<P, E>>;
-  destroy(): void;
-}
-
 window.__OWL_DEVTOOLS__ ||= { apps, Fiber, RootFiber, toRaw, reactive };
 
 export class App<
@@ -74,10 +65,8 @@ export class App<
   props: P;
   env: E;
   scheduler = new Scheduler();
-  subRoots: Set<Root<any, any>> = new Set();
-  root: Root<P, E> | null = null;
+  root: ComponentNode<P, E> | null = null;
   warnIfNoStaticProps: boolean;
-  _lastRootEl: HTMLElement | ShadowRoot | null = null; // temporary ref to propagate to roots
 
   constructor(Root: ComponentConstructor<P, E>, config: AppConfig<P, E> = {}) {
     super(config);
@@ -102,64 +91,14 @@ export class App<
     target: HTMLElement | ShadowRoot,
     options?: MountOptions
   ): Promise<Component<P, E> & InstanceType<T>> {
-    this.root = this.createRoot(this.Root, { props: this.props });
-    return this.root.mount(target, options) as any;
-  }
-
-  createRoot<Props extends object, SubEnv = any>(
-    Root: ComponentConstructor<Props, E>,
-    config: RootConfig<Props, SubEnv> = {}
-  ): Root<Props, SubEnv> {
-    const props = config.props || ({} as Props);
-    const env = this.env;
-    const root: Root<Props, SubEnv> = {
-      node: null,
-      mount: (target: HTMLElement | ShadowRoot, options?: MountOptions) => {
-        App.validateTarget(target);
-
-        // hack to make sure the sub root get the sub env if necessary. for owl 3,
-        // would be nice to rethink the initialization process to make sure that
-        // we can create a ComponentNode and give it explicitely the env, instead
-        // of looking it up in the app
-        if (config.env) {
-          this.env = config.env as any;
-        }
-        const restore = saveCurrent();
-        if (options?.position === "attach") {
-          if (Root.template) {
-            throw new Error("Cannot attach a component with a template");
-          }
-          this._lastRootEl = target;
-        } else {
-          if (!Root.template) {
-            // no template => trigger an error
-            this.getTemplate("");
-          }
-        }
-        const node = this.makeNode(Root, props);
-        root.node = node;
-        this._lastRootEl = null;
-        restore();
-        if (config.env) {
-          this.env = env;
-        }
-        if (this.dev) {
-          validateProps(Root, props, { __owl__: { app: this } });
-        }
-        const prom = this.mountNode(node, target, options);
-        return prom;
-      },
-      destroy: () => {
-        this.subRoots.delete(root);
-        if (root.node) {
-          root.node?.destroy();
-          this.scheduler.processTasks();
-        }
-      },
-    };
-
-    this.subRoots.add(root);
-    return root;
+    App.validateTarget(target);
+    if (this.dev) {
+      validateProps(this.Root, this.props, { __owl__: { app: this } });
+    }
+    const node = this.makeNode(this.Root, this.props);
+    const prom = this.mountNode(node, target, options);
+    this.root = node;
+    return prom;
   }
 
   makeNode(Component: ComponentConstructor, props: any): ComponentNode {
@@ -194,17 +133,10 @@ export class App<
   }
 
   destroy() {
-    const roots = [...this.subRoots].reverse();
-    for (let root of roots) {
-      root.destroy();
+    if (this.root) {
+      this.root.destroy();
+      this.scheduler.processTasks();
     }
-    // if (this.root) {
-    //   for (let subroot of this.subRoots) {
-    //     subroot.destroy();
-    //   }
-    //   this.root.destroy();
-    this.scheduler.processTasks();
-    // }
     apps.delete(this);
   }
 

src/runtime/component.ts

@@ -9,7 +9,6 @@ export type Props = { [key: string]: any };
 
 interface StaticComponentProperties {
   template: string;
-  dynamicContent?: { [spec: string]: string };
   defaultProps?: any;
   props?: Schema;
   components?: { [componentName: string]: ComponentConstructor };
@@ -24,7 +23,7 @@ export type ComponentConstructor<P extends Props = any, E = any> = (new (
 
 export class Component<Props = any, Env = any> {
   static template: string = "";
-  static props?: Schema;
+  static props?: any;
   static defaultProps?: any;
 
   props: Props;

src/runtime/component_node.ts

@@ -6,19 +6,10 @@ import { OwlError } from "../common/owl_error";
 import { Fiber, makeChildFiber, makeRootFiber, MountFiber, MountOptions } from "./fibers";
 import { clearReactivesForCallback, getSubscriptions, reactive, targets } from "./reactivity";
 import { STATUS } from "./status";
-import { batched, Callback, Markup } from "./utils";
-import { xml } from "./template_set";
-import { compileExpr } from "../common/inline_expressions";
+import { batched, Callback, possiblySync } from "./utils";
 
 let currentNode: ComponentNode | null = null;
 
-export function saveCurrent() {
-  let n = currentNode;
-  return () => {
-    currentNode = n;
-  };
-}
-
 export function getCurrent(): ComponentNode {
   if (!currentNode) {
     throw new OwlError("No active component (a hook function should only be called in 'setup')");
@@ -126,123 +117,40 @@ export class ComponentNode<P extends Props = any, E = any> implements VNode<Comp
     }
     this.component = new C(props, env, this);
     const ctx = Object.assign(Object.create(this.component), { this: this.component });
-    if (C.template) {
-      this.renderFn = app.getTemplate(C.template).bind(this.component, ctx, this);
-    } else {
-      // component will be attached
-      this.renderFn = app.getTemplate(xml``).bind(this.component, ctx, this);
-      if (C.dynamicContent) {
-        this.prepareAttach(app._lastRootEl!, C.dynamicContent, ctx);
-      }
-    }
+    this.renderFn = app.getTemplate(C.template).bind(this.component, ctx, this);
     this.component.setup();
     currentNode = null;
   }
 
-  prepareAttach(
-    el: HTMLElement | ShadowRoot,
-    dynamicContent: { [spec: string]: string },
-    ctx: any
-  ) {
-    const attrs: { selector: string; attr: string; fn: Function }[] = [];
-    const handlers: { selector: string; event: string; fn: any }[] = [];
-    const tOuts: { selector: string; fn: Function }[] = [];
-    for (let key in dynamicContent) {
-      const value = dynamicContent[key];
-      const parts = key.split(":");
-      if (parts[1].startsWith("t-att-")) {
-        const attr = parts[1].slice(6);
-        const fn = new Function("ctx", `return ${compileExpr(value)};`);
-        attrs.push({
-          selector: parts[0],
-          attr,
-          fn,
-        });
-      }
-      if (parts[1].startsWith("t-on-")) {
-        const event = parts[1].slice(5);
-        // const fn = new Function("ctx", "ev", `${compileExpr(value)}(ev);`);
-        const fn = (ev: any) => (this as any).component[value](ev);
-        handlers.push({
-          selector: parts[0],
-          event,
-          fn,
-        });
-      }
-      if (parts[1] === "t-out") {
-        const fn = new Function("ctx", `return ${compileExpr(value)};`);
-        tOuts.push({ selector: parts[0], fn });
-      }
-    }
-    const handleAttrs = () => {
-      for (let attr of attrs) {
-        const val = attr.fn.call(this.component, ctx);
-        // todo: cache the queryselector result?
-        const target = attr.selector === "root" ? el : (el.querySelector(attr.selector) as any);
-        if (target) {
-          target.setAttribute(attr.attr, val);
-        }
-      }
-    };
-    const handleEvents = () => {
-      for (let handler of handlers) {
-        // const val = attr.fn.call(this.component, ctx);
-        // todo: cache the queryselector result?
-        const target =
-          handler.selector === "root" ? el : (el.querySelector(handler.selector) as any);
-        if (target) {
-          target.addEventListener(handler.event, handler.fn);
-        }
-      }
-    };
-    const handleTOuts = () => {
-      for (let tOut of tOuts) {
-        const val = tOut.fn.call(this.component, ctx);
-        // todo: cache the queryselector result?
-        const target = tOut.selector === "root" ? el : (el.querySelector(tOut.selector) as any);
-        if (target) {
-          if (val instanceof Markup) {
-            target.innerHTML = val as any;
-          } else {
-            target.textContent = val;
-          }
-        }
-      }
-    };
-    if (attrs.length) {
-      this.mounted.push(handleAttrs);
-      this.patched.push(handleAttrs);
-    }
-    if (handlers.length) {
-      this.mounted.push(handleEvents);
-    }
-    if (tOuts.length) {
-      this.mounted.push(handleTOuts);
-      this.patched.push(handleTOuts);
-    }
-  }
-
   mountComponent(target: any, options?: MountOptions) {
     const fiber = new MountFiber(this, target, options);
     this.app.scheduler.addFiber(fiber);
     this.initiateRender(fiber);
   }
 
-  async initiateRender(fiber: Fiber | MountFiber) {
+  initiateRender(fiber: Fiber | MountFiber) {
     this.fiber = fiber;
     if (this.mounted.length) {
       fiber.root!.mounted.push(fiber);
     }
     const component = this.component;
-    try {
-      await Promise.all(this.willStart.map((f) => f.call(component)));
-    } catch (e) {
-      this.app.handleError({ node: this, error: e });
-      return;
-    }
-    if (this.status === STATUS.NEW && this.fiber === fiber) {
-      fiber.render();
-    }
+    return possiblySync(
+      () => {
+        const willStartResults = this.willStart.map((f) => f.call(component));
+        if (willStartResults.some((r) => typeof r?.then === "function")) {
+          return Promise.all(willStartResults);
+        }
+        return;
+      },
+      () => {
+        if (this.status === STATUS.NEW && this.fiber === fiber) {
+          fiber.render();
+        }
+      },
+      (e: any) => {
+        this.app.handleError({ node: this, error: e });
+      }
+    );
   }
 
   async render(deep: boolean) {
@@ -338,7 +246,7 @@ export class ComponentNode<P extends Props = any, E = any> implements VNode<Comp
     this.status = STATUS.DESTROYED;
   }
 
-  async updateAndRender(props: P, parentFiber: Fiber) {
+  updateAndRender(props: P, parentFiber: Fiber) {
     this.nextProps = props;
     props = Object.assign({}, props);
     // update
@@ -358,20 +266,29 @@ export class ComponentNode<P extends Props = any, E = any> implements VNode<Comp
       }
     }
     currentNode = null;
-    const prom = Promise.all(this.willUpdateProps.map((f) => f.call(component, props)));
-    await prom;
-    if (fiber !== this.fiber) {
-      return;
-    }
-    component.props = props;
-    fiber.render();
-    const parentRoot = parentFiber.root!;
-    if (this.willPatch.length) {
-      parentRoot.willPatch.push(fiber);
-    }
-    if (this.patched.length) {
-      parentRoot.patched.push(fiber);
-    }
+    return possiblySync(
+      () => {
+        const willUpdateProps = this.willUpdateProps.map((f) => f.call(component, props));
+        if (willUpdateProps.some((p) => typeof p?.then === "function")) {
+          return Promise.all(willUpdateProps);
+        }
+        return;
+      },
+      () => {
+        if (fiber !== this.fiber) {
+          return;
+        }
+        component.props = props;
+        fiber.render();
+        const parentRoot = parentFiber.root!;
+        if (this.willPatch.length) {
+          parentRoot.willPatch.push(fiber);
+        }
+        if (this.patched.length) {
+          parentRoot.patched.push(fiber);
+        }
+      }
+    );
   }
 
   /**

src/runtime/fibers.ts

@@ -207,7 +207,7 @@ export class RootFiber extends Fiber {
   }
 }
 
-type Position = "first-child" | "last-child" | "attach";
+type Position = "first-child" | "last-child";
 
 export interface MountOptions {
   position?: Position;

src/runtime/hooks.ts

@@ -59,7 +59,7 @@ export function useChildSubEnv(envExtension: Env) {
 // useEffect
 // -----------------------------------------------------------------------------
 
-type EffectDeps<T extends unknown[]> = T | (T extends [...infer H, never] ? EffectDeps<H> : never);
+type EffectDeps<T extends any[]> = T | (T extends [...infer H, never] ? EffectDeps<H> : never);
 
 /**
  * @template T
@@ -67,7 +67,7 @@ type EffectDeps<T extends unknown[]> = T | (T extends [...infer H, never] ? Effe
  * @returns {void|(()=>void)} a cleanup function that reverses the side
  *      effects of the effect callback.
  */
-type Effect<T extends unknown[]> = (...dependencies: EffectDeps<T>) => void | (() => void);
+type Effect<T extends [...T]> = (...dependencies: EffectDeps<T>) => void | (() => void);
 
 /**
  * This hook will run a callback when a component is mounted and patched, and
@@ -76,15 +76,15 @@ type Effect<T extends unknown[]> = (...dependencies: EffectDeps<T>) => void | ((
  *
  * @template T
  * @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
  *      run again. If the dependencies did not change, the effect will not run
  *      again. The default value returns an array containing only NaN because
  *      NaN !== NaN, which will cause the effect to rerun on every patch.
  */
-export function useEffect<T extends unknown[]>(
+export function useEffect<T extends [...T]>(
   effect: Effect<T>,
-  computeDependencies: () => [...T] = () => [NaN] as never
+  computeDependencies: () => T = () => [NaN] as never
 ) {
   let cleanup: (() => void) | void;
   let dependencies: T;
@@ -136,20 +136,3 @@ export function useExternalListener(
   onMounted(() => target.addEventListener(eventName, boundHandler, eventParams));
   onWillUnmount(() => target.removeEventListener(eventName, boundHandler, eventParams));
 }
-
-// -----------------------------------------------------------------------------
-// useAttachedEl
-// -----------------------------------------------------------------------------
-
-/**
- * The purpose of this hook is to allow attached components to get a reference to
- * the element they have been attached on.
- */
-export function useAttachedEl(): HTMLElement {
-  const node = getCurrent();
-  const el = node.app._lastRootEl as HTMLElement;
-  if (!el) {
-    throw new Error("useAttachedEl can only be called with component that are attached");
-  }
-  return el;
-}

src/runtime/index.ts

@@ -41,7 +41,7 @@ export { useComponent, useState } from "./component_node";
 export { status } from "./status";
 export { reactive, markRaw, toRaw } from "./reactivity";
 export { useEffect, useEnv, useExternalListener, useRef, useChildSubEnv, useSubEnv } from "./hooks";
-export { batched, EventBus, whenReady, loadFile, markup } from "./utils";
+export { EventBus, whenReady, loadFile, markup } from "./utils";
 export {
   onWillStart,
   onMounted,

src/runtime/lifecycle_hooks.ts

@@ -3,50 +3,42 @@ import { nodeErrorHandlers } from "./error_handling";
 import { OwlError } from "../common/owl_error";
 
 const TIMEOUT = Symbol("timeout");
-const HOOK_TIMEOUT: { [key: string]: number } = {
-  onWillStart: 3000,
-  onWillUpdateProps: 3000,
-};
 function wrapError(fn: (...args: any[]) => any, hookName: string) {
-  const error = new OwlError() as Error & {
+  const error = new OwlError(`The following error occurred in ${hookName}: `) as Error & {
     cause: any;
   };
-  const timeoutError = new OwlError();
+  const timeoutError = new OwlError(`${hookName}'s promise hasn't resolved after 3 seconds`);
   const node = getCurrent();
   return (...args: any[]) => {
     const onError = (cause: any) => {
       error.cause = cause;
-      error.message =
-        cause instanceof Error
-          ? `The following error occurred in ${hookName}: "${cause.message}"`
-          : `Something that is not an Error was thrown in ${hookName} (see this Error's "cause" property)`;
+      if (cause instanceof Error) {
+        error.message += `"${cause.message}"`;
+      } else {
+        error.message = `Something that is not an Error was thrown in ${hookName} (see this Error's "cause" property)`;
+      }
       throw error;
     };
-    let result;
     try {
-      result = fn(...args);
+      const result = fn(...args);
+      if (result instanceof Promise) {
+        if (hookName === "onWillStart" || hookName === "onWillUpdateProps") {
+          const fiber = node.fiber;
+          Promise.race([
+            result.catch(() => {}),
+            new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), 3000)),
+          ]).then((res) => {
+            if (res === TIMEOUT && node.fiber === fiber) {
+              console.warn(timeoutError);
+            }
+          });
+        }
+        return result.catch(onError);
+      }
+      return result;
     } catch (cause) {
       onError(cause);
     }
-    if (!(result instanceof Promise)) {
-      return result;
-    }
-    const timeout = HOOK_TIMEOUT[hookName];
-    if (timeout) {
-      const fiber = node.fiber;
-      Promise.race([
-        result.catch(() => {}),
-        new Promise((resolve) => setTimeout(() => resolve(TIMEOUT), timeout)),
-      ]).then((res) => {
-        if (res === TIMEOUT && node.fiber === fiber && node.status <= 2) {
-          timeoutError.message = `${hookName}'s promise hasn't resolved after ${
-            timeout / 1000
-          } seconds`;
-          console.log(timeoutError);
-        }
-      });
-    }
-    return result.catch(onError);
   };
 }
 

src/runtime/portal.ts

@@ -65,7 +65,7 @@ export class Portal extends Component {
       type: String,
     },
     slots: true,
-  } as const;
+  };
 
   setup() {
     const node: any = this.__owl__;

src/runtime/reactivity.ts

@@ -20,9 +20,8 @@ type CollectionRawType = "Set" | "Map" | "WeakMap";
 const objectToString = Object.prototype.toString;
 const objectHasOwnProperty = Object.prototype.hasOwnProperty;
 
-// Use arrays because Array.includes is faster than Set.has for small arrays
-const SUPPORTED_RAW_TYPES = ["Object", "Array", "Set", "Map", "WeakMap"];
-const COLLECTION_RAW_TYPES = ["Set", "Map", "WeakMap"];
+const SUPPORTED_RAW_TYPES = new Set(["Object", "Array", "Set", "Map", "WeakMap"]);
+const COLLECTION_RAWTYPES = new Set(["Set", "Map", "WeakMap"]);
 
 /**
  * extract "RawType" from strings like "[object RawType]" => this lets us ignore
@@ -46,7 +45,7 @@ function canBeMadeReactive(value: any): boolean {
   if (typeof value !== "object") {
     return false;
   }
-  return SUPPORTED_RAW_TYPES.includes(rawType(value));
+  return SUPPORTED_RAW_TYPES.has(rawType(value));
 }
 /**
  * Creates a reactive from the given object/callback if possible and returns it,
@@ -221,7 +220,7 @@ export function reactive<T extends Target>(target: T, callback: Callback = NO_CA
   const reactivesForTarget = reactiveCache.get(target)!;
   if (!reactivesForTarget.has(callback)) {
     const targetRawType = rawType(target);
-    const handler = COLLECTION_RAW_TYPES.includes(targetRawType)
+    const handler = COLLECTION_RAWTYPES.has(targetRawType)
       ? collectionsProxyHandler(target as Collection, callback, targetRawType as CollectionRawType)
       : basicProxyHandler<T>(callback);
     const proxy = new Proxy(target, handler as ProxyHandler<T>) as Reactive<T>;
@@ -250,7 +249,7 @@ function basicProxyHandler<T extends Target>(callback: Callback): ProxyHandler<T
     set(target, key, value, receiver) {
       const hadKey = objectHasOwnProperty.call(target, key);
       const originalValue = Reflect.get(target, key, receiver);
-      const ret = Reflect.set(target, key, toRaw(value), receiver);
+      const ret = Reflect.set(target, key, value, receiver);
       if (!hadKey && objectHasOwnProperty.call(target, key)) {
         notifyReactives(target, KEYCHANGES);
       }

src/runtime/scheduler.ts

@@ -16,7 +16,6 @@ export class Scheduler {
   frame: number = 0;
   delayedRenders: Fiber[] = [];
   cancelledNodes: Set<ComponentNode> = new Set();
-  processing = false;
 
   constructor() {
     this.requestAnimationFrame = Scheduler.requestAnimationFrame;
@@ -54,10 +53,6 @@ export class Scheduler {
   }
 
   processTasks() {
-    if (this.processing) {
-      return;
-    }
-    this.processing = true;
     this.frame = 0;
     for (let node of this.cancelledNodes) {
       node._destroy();
@@ -71,7 +66,6 @@ export class Scheduler {
         this.tasks.delete(task);
       }
     }
-    this.processing = false;
   }
 
   processFiber(fiber: RootFiber) {

src/runtime/template_set.ts

@@ -4,16 +4,44 @@ import { getCurrent } from "./component_node";
 import { Portal, portalTemplate } from "./portal";
 import { helpers } from "./template_helpers";
 import { OwlError } from "../common/owl_error";
-import { parseXML } from "../common/utils";
 
 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 {
   dev?: boolean;
   translatableAttributes?: string[];
   translateFn?: (s: string) => string;
-  templates?: string | Document | Record<string, string>;
-  getTemplate?: (s: string) => Element | Function | string | void;
+  templates?: string | Document;
 }
 
 export class TemplateSet {
@@ -23,7 +51,6 @@ export class TemplateSet {
   dev: boolean;
   rawTemplates: typeof globalTemplates = Object.create(globalTemplates);
   templates: { [name: string]: Template } = {};
-  getRawTemplate?: (s: string) => Element | Function | string | void;
   translateFn?: (s: string) => string;
   translatableAttributes?: string[];
   Portal = Portal;
@@ -33,15 +60,8 @@ export class TemplateSet {
     this.translateFn = config.translateFn;
     this.translatableAttributes = config.translatableAttributes;
     if (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.addTemplates(config.templates);
     }
-    this.getRawTemplate = config.getTemplate;
   }
 
   addTemplate(name: string, template: string | Element) {
@@ -80,7 +100,7 @@ export class TemplateSet {
 
   getTemplate(name: string): Template {
     if (!(name in this.templates)) {
-      const rawTemplate = this.getRawTemplate?.(name) || this.rawTemplates[name];
+      const rawTemplate = this.rawTemplates[name];
       if (rawTemplate === undefined) {
         let extraInfo = "";
         try {

src/runtime/utils.ts

@@ -88,3 +88,24 @@ export class Markup extends String {}
 export function markup(value: any) {
   return new Markup(value);
 }
+
+export function possiblySync(computation: Function, onSuccess: Function, onError?: Function) {
+  try {
+    let result;
+    if (onError) {
+      try {
+        result = computation();
+      } catch (e) {
+        return onError(e);
+      }
+    } else {
+      result = computation();
+    }
+    if (typeof result?.then === "function") {
+      return result.then(onSuccess, onError);
+    }
+    return onSuccess(result);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+}

src/runtime/validation.ts

@@ -1,7 +1,15 @@
 import { OwlError } from "../common/owl_error";
 import { toRaw } from "./reactivity";
 
-type BaseType = { new (...args: any[]): any } | true | "*";
+type BaseType =
+  | typeof String
+  | typeof Boolean
+  | typeof Number
+  | typeof Date
+  | typeof Object
+  | typeof Array
+  | true
+  | "*";
 
 interface TypeInfo {
   type?: TypeDescription;

src/version.ts

@@ -1,2 +1,2 @@
 // do not modify manually. This file is generated by the release script.
-export const version = "2.4.0";
+export const version = "2.2.6";

tests/app/__snapshots__/app.test.ts.snap

@@ -43,33 +43,6 @@ exports[`app app: clear scheduler tasks and destroy cancelled nodes immediately
 }"
 `;
 
-exports[`app can call processTask twice in a row without crashing 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 = \\"\\") {
-    const b2 = text(\`parent\`);
-    const b3 = comp1({}, key + \`__1\`, node, this, null);
-    return multi([b2, b3]);
-  }
-}"
-`;
-
-exports[`app can call processTask twice in a row without crashing 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div/>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
 exports[`app can configure an app with props 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -84,19 +57,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/app/__snapshots__/sub_root.test.ts.snap

@@ -1,199 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`destroy a subroot while another component is mounted in main app 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  const comp1 = app.createComponent(\`ChildB\`, true, false, false, []);
-  const comp2 = app.createComponent(\`ChildA\`, true, false, false, []);
-  
-  return function template(ctx, node, key = \\"\\") {
-    let b2, b3;
-    if (ctx['state'].flag) {
-      b2 = comp1({}, key + \`__1\`, node, this, null);
-    } else {
-      b3 = comp2({}, key + \`__2\`, node, this, null);
-    }
-    return multi([b2, b3]);
-  }
-}"
-`;
-
-exports[`destroy a subroot while another component is mounted in main app 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block3 = createBlock(\`<div block-ref=\\"0\\"/>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    const b2 = text(\`a\`);
-    let ref1 = (el) => this.__owl__.setRef((\`elem\`), el);
-    const b3 = block3([ref1]);
-    return multi([b2, b3]);
-  }
-}"
-`;
-
-exports[`destroy a subroot while another component is mounted in main app 3`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  return function template(ctx, node, key = \\"\\") {
-    return text(\`c\`);
-  }
-}"
-`;
-
-exports[`destroy a subroot while another component is mounted in main app 4`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  return function template(ctx, node, key = \\"\\") {
-    return text(\`b\`);
-  }
-}"
-`;
-
-exports[`subroot by default, env is the same in sub root 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>main app</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot by default, env is the same in sub root 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>sub root</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot can create a root in a setup function, then use a hook 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  return function template(ctx, node, key = \\"\\") {
-    return text(\`a\`);
-  }
-}"
-`;
-
-exports[`subroot can mount subroot 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>main app</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot can mount subroot 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>sub root</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot can mount subroot inside own dom 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>main app</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot can mount subroot inside own dom 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>sub root</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot env can be specified for sub roots 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>main app</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot env can be specified for sub roots 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>sub root</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot subcomponents can be destroyed, and it properly cleanup the subroots 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>main app</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
-exports[`subroot subcomponents can be destroyed, and it properly cleanup the subroots 2`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>sub root</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;

tests/app/app.test.ts

@@ -1,4 +1,4 @@
-import { App, Component, mount, onWillPatch, onWillStart, useState, xml } from "../../src";
+import { App, Component, mount, onWillStart, useState, xml } from "../../src";
 import { status } from "../../src/runtime/status";
 import {
   makeTestFixture,
@@ -167,38 +167,4 @@ describe("app", () => {
       ]
     `);
   });
-
-  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"]);
-  });
-
-  test("can call processTask twice in a row without crashing", async () => {
-    class Child extends Component {
-      static template = xml`<div/>`;
-      setup() {
-        onWillPatch(() => app.scheduler.processTasks());
-      }
-    }
-    class SomeComponent extends Component {
-      static template = xml`parent<Child/>`;
-      static components = { Child };
-    }
-
-    const app = new App(SomeComponent);
-    await app.mount(fixture);
-    expect(fixture.innerHTML).toBe("parent<div></div>");
-  });
 });

tests/app/sub_root.test.ts

@@ -1,176 +0,0 @@
-import { App, Component, onMounted, onWillDestroy, useRef, useState, xml } from "../../src";
-import { status } from "../../src/runtime/status";
-import { makeTestFixture, nextTick, snapshotEverything } from "../helpers";
-
-let fixture: HTMLElement;
-
-snapshotEverything();
-
-beforeEach(() => {
-  fixture = makeTestFixture();
-});
-
-class SomeComponent extends Component {
-  static template = xml`<div>main app</div>`;
-}
-
-class SubComponent extends Component {
-  static template = xml`<div>sub root</div>`;
-}
-
-describe("subroot", () => {
-  test("can mount subroot", async () => {
-    const app = new App(SomeComponent);
-    const comp = await app.mount(fixture);
-    expect(fixture.innerHTML).toBe("<div>main app</div>");
-    const subRoot = app.createRoot(SubComponent);
-    const subcomp = await subRoot.mount(fixture);
-    expect(fixture.innerHTML).toBe("<div>main app</div><div>sub root</div>");
-
-    app.destroy();
-    expect(fixture.innerHTML).toBe("");
-    expect(status(comp)).toBe("destroyed");
-    expect(status(subcomp)).toBe("destroyed");
-  });
-
-  test("can mount subroot inside own dom", async () => {
-    const app = new App(SomeComponent);
-    const comp = await app.mount(fixture);
-    expect(fixture.innerHTML).toBe("<div>main app</div>");
-    const subRoot = app.createRoot(SubComponent);
-    const subcomp = await subRoot.mount(fixture.querySelector("div")!);
-    expect(fixture.innerHTML).toBe("<div>main app<div>sub root</div></div>");
-
-    app.destroy();
-    expect(fixture.innerHTML).toBe("");
-    expect(status(comp)).toBe("destroyed");
-    expect(status(subcomp)).toBe("destroyed");
-  });
-
-  test("by default, env is the same in sub root", async () => {
-    let env, subenv;
-    class SC extends SomeComponent {
-      setup() {
-        env = this.env;
-      }
-    }
-    class Sub extends SubComponent {
-      setup() {
-        subenv = this.env;
-      }
-    }
-
-    const app = new App(SC);
-    await app.mount(fixture);
-    const subRoot = app.createRoot(Sub);
-    await subRoot.mount(fixture);
-
-    expect(env).toBeDefined();
-    expect(subenv).toBeDefined();
-    expect(env).toBe(subenv);
-  });
-
-  test("env can be specified for sub roots", async () => {
-    const env1 = { env1: true };
-    const env2 = {};
-    let someComponentEnv: any, subComponentEnv: any;
-    class SC extends SomeComponent {
-      setup() {
-        someComponentEnv = this.env;
-      }
-    }
-    class Sub extends SubComponent {
-      setup() {
-        subComponentEnv = this.env;
-      }
-    }
-
-    const app = new App(SC, { env: env1 });
-    await app.mount(fixture);
-    const subRoot = app.createRoot(Sub, { env: env2 });
-    await subRoot.mount(fixture);
-
-    // because env is different in app => it is given a sub object, frozen and all
-    // not sure it is a good idea, but it's the way owl 2 works. maybe we should
-    // avoid doing anything with the main env and let user code do it if they
-    // want. in that case, we can change the test here to assert that they are equal
-    expect(someComponentEnv).not.toBe(env1);
-    expect(someComponentEnv!.env1).toBe(true);
-    expect(subComponentEnv).toBe(env2);
-  });
-
-  test("subcomponents can be destroyed, and it properly cleanup the subroots", async () => {
-    const app = new App(SomeComponent);
-    const comp = await app.mount(fixture);
-    expect(fixture.innerHTML).toBe("<div>main app</div>");
-    const root = app.createRoot(SubComponent);
-    const subcomp = await root.mount(fixture.querySelector("div")!);
-    expect(fixture.innerHTML).toBe("<div>main app<div>sub root</div></div>");
-
-    root.destroy();
-    expect(fixture.innerHTML).toBe("<div>main app</div>");
-    expect(status(comp)).not.toBe("destroyed");
-    expect(status(subcomp)).toBe("destroyed");
-  });
-
-  test("can create a root in a setup function, then use a hook", async () => {
-    class C extends Component {
-      static template = xml`c`;
-    }
-
-    class A extends Component {
-      static template = xml`a`;
-      state: any;
-      setup() {
-        app.createRoot(C);
-        this.state = useState({ value: 1 });
-      }
-    }
-
-    const app = new App(A);
-    await app.mount(fixture);
-    expect(fixture.innerHTML).toBe("a");
-  });
-});
-
-test("destroy a subroot while another component is mounted in main app", async () => {
-  class C extends Component {
-    static template = xml`c`;
-  }
-
-  class ChildA extends Component {
-    static template = xml`a<div t-ref="elem"></div>`;
-    ref: any;
-    setup() {
-      this.ref = useRef("elem");
-      let root = app.createRoot(C);
-      onMounted(() => {
-        root.mount(this.ref.el);
-      });
-      onWillDestroy(() => {
-        root.destroy();
-      });
-    }
-  }
-  class ChildB extends Component {
-    static template = xml`b`;
-  }
-
-  class SomeComponent extends Component {
-    static template = xml`
-        <t t-if="state.flag"><ChildB/></t>
-        <t t-else=""><ChildA/></t>
-        `;
-    static components = { ChildA, ChildB };
-    state = useState({ flag: false });
-  }
-
-  const app = new App(SomeComponent);
-  const comp = await app.mount(fixture);
-  expect(fixture.innerHTML).toBe("a<div></div>");
-  await nextTick();
-  expect(fixture.innerHTML).toBe("a<div>c</div>");
-  comp.state.flag = true;
-  await nextTick();
-  expect(fixture.innerHTML).toBe("b");
-});

tests/compiler/__snapshots__/comments.test.ts.snap

@@ -1,38 +1,5 @@
 // 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/compiler/__snapshots__/simple_templates.test.ts.snap

@@ -341,39 +341,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/compiler/__snapshots__/t_esc.test.ts.snap

@@ -1,41 +1,5 @@
 // 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/compiler/__snapshots__/t_set.test.ts.snap

@@ -1,50 +1,5 @@
 // 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/compiler/__snapshots__/template_set.test.ts.snap

@@ -101,55 +101,3 @@ 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();
-  }
-}"
-`;

tests/compiler/comments.test.ts

@@ -26,19 +26,4 @@ describe("comments", () => {
         </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} -->");
-  });
 });

tests/compiler/inline_expressions.test.ts

@@ -1,4 +1,4 @@
-import { compileExpr, tokenize } from "../../src/common/inline_expressions";
+import { compileExpr, tokenize } from "../../src/compiler/inline_expressions";
 
 describe("tokenizer", () => {
   test("simple tokens", () => {
@@ -174,9 +174,6 @@ describe("expression evaluation", () => {
     expect(compileExpr("list.data.map((data) => data)")).toBe(
       "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", () => {
     // e is added to localvars in inline_expression but not removed after the arrow func body

tests/compiler/simple_templates.test.ts

@@ -154,19 +154,4 @@ describe("simple templates, mostly static", () => {
       </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}");
-  });
 });

tests/compiler/t_esc.test.ts

@@ -121,19 +121,4 @@ describe("t-esc", () => {
     mount(bdom, fixture);
     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}");
-  });
 });

tests/compiler/t_set.test.ts

@@ -54,21 +54,6 @@ describe("t-set", () => {
     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", () => {
     const template = `
       <t>

tests/compiler/template_set.test.ts

@@ -78,62 +78,4 @@ describe("loading templates", () => {
     context.addTemplates(xml);
     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>");
-  });
 });

tests/compiler/validation.test.ts

@@ -48,7 +48,7 @@ describe("basic validation", () => {
   test("compilation error", () => {
     const template = `<div t-att-class="a b">test</div>`;
     expect(() => renderToString(template))
-      .toThrow(`Failed to compile anonymous template: Unexpected identifier 'ctx'
+      .toThrow(`Failed to compile anonymous template: Unexpected identifier
 
 generated code:
 function(app, bdom, helpers) {

tests/components/__snapshots__/basics.test.ts.snap

@@ -97,19 +97,6 @@ exports[`basics a component cannot be mounted in a detached node (even if node i
 }"
 `;
 
-exports[`basics a component cannot be mounted in a detached node 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div/>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
 exports[`basics a component inside a component 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -274,19 +261,6 @@ exports[`basics can mount a simple component with props 1`] = `
 }"
 `;
 
-exports[`basics cannot mount on a documentFragment 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div>content</div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
 exports[`basics child can be updated 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -1028,19 +1002,6 @@ exports[`basics three level of components with collapsing root nodes 3`] = `
 }"
 `;
 
-exports[`basics throws if mounting on target=null 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<span>simple vnode</span>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
 exports[`basics two child components 1`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/components/__snapshots__/concurrency.test.ts.snap

@@ -1861,10 +1861,10 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 3`] =
 ) {
   let { text, createBlock, list, multi, html, toggler, comment } = bdom;
   
-  let block3 = createBlock(\`<p block-handler-0=\\"click\\"><block-text-1/></p>\`);
+  let block3 = createBlock(\`<span block-handler-0=\\"click\\"><block-text-1/></span>\`);
   
   return function template(ctx, node, key = \\"\\") {
-    const b2 = text(\`D\`);
+    const b2 = text(\`C\`);
     let hdlr1 = [ctx['increment'], ctx];
     let txt1 = ctx['state'].val;
     const b3 = block3([hdlr1, txt1]);
@@ -1878,10 +1878,10 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 4`] =
 ) {
   let { text, createBlock, list, multi, html, toggler, comment } = bdom;
   
-  let block3 = createBlock(\`<span block-handler-0=\\"click\\"><block-text-1/></span>\`);
+  let block3 = createBlock(\`<p block-handler-0=\\"click\\"><block-text-1/></p>\`);
   
   return function template(ctx, node, key = \\"\\") {
-    const b2 = text(\`C\`);
+    const b2 = text(\`D\`);
     let hdlr1 = [ctx['increment'], ctx];
     let txt1 = ctx['state'].val;
     const b3 = block3([hdlr1, txt1]);

tests/components/__snapshots__/lifecycle.test.ts.snap

@@ -332,31 +332,6 @@ exports[`lifecycle hooks lifecycle semantics, part 3 1`] = `
 }"
 `;
 
-exports[`lifecycle hooks lifecycle semantics, part 3 3`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  const comp1 = app.createComponent(\`GrandChild\`, true, false, false, []);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return comp1({}, key + \`__1\`, node, this, null);
-  }
-}"
-`;
-
-exports[`lifecycle hooks lifecycle semantics, part 3 4`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div/>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    return block1();
-  }
-}"
-`;
-
 exports[`lifecycle hooks lifecycle semantics, part 4 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -708,7 +683,7 @@ exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly calle
 }"
 `;
 
-exports[`lifecycle hooks timeout in onWillStart doesn't emit a console log if app is destroyed 1`] = `
+exports[`lifecycle hooks timeout in onWillStart emits a warning 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, comment } = bdom;
@@ -721,20 +696,7 @@ exports[`lifecycle hooks timeout in onWillStart doesn't emit a console log if ap
 }"
 `;
 
-exports[`lifecycle hooks timeout in onWillStart emits a console log 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 onWillUpdateProps emits a console log 1`] = `
+exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 1`] = `
 "function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, comment } = bdom;
@@ -748,7 +710,7 @@ exports[`lifecycle hooks timeout in onWillUpdateProps emits a console log 1`] =
 }"
 `;
 
-exports[`lifecycle hooks timeout in onWillUpdateProps emits a console log 2`] = `
+exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 2`] = `
 "function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, comment } = bdom;

tests/components/__snapshots__/props.test.ts.snap

@@ -66,29 +66,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -435,29 +412,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/components/__snapshots__/props_validation.test.ts.snap

@@ -167,45 +167,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -924,20 +885,6 @@ exports[`props validation props: list of strings 1`] = `
 }"
 `;
 
-exports[`props validation validate props for root component 1`] = `
-"function anonymous(app, bdom, helpers
-) {
-  let { text, createBlock, list, multi, html, toggler, comment } = bdom;
-  
-  let block1 = createBlock(\`<div><block-text-0/></div>\`);
-  
-  return function template(ctx, node, key = \\"\\") {
-    let txt1 = ctx['message'];
-    return block1([txt1]);
-  }
-}"
-`;
-
 exports[`props validation validate simple types 1`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/components/__snapshots__/slots.test.ts.snap

@@ -1,30 +1,5 @@
 // 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`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -226,31 +201,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {
@@ -1116,45 +1066,6 @@ 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`] = `
 "function anonymous(app, bdom, helpers
 ) {

tests/components/__snapshots__/t_model.test.ts.snap

@@ -44,26 +44,7 @@ exports[`t-model directive .trim modifier 1`] = `
   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 = \\"\\") {
-    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>\`);
+  let block1 = createBlock(\`<div><input block-property-0=\\"value\\" block-handler-1=\\"input\\"/><span><block-text-2/></span></div>\`);
   
   return function template(ctx, node, key = \\"\\") {
     const bExpr1 = ctx['state'];

tests/components/attached_components.test.ts

@@ -1,258 +0,0 @@
-import { Component, markup, mount, useState, xml } from "../../src";
-import { useAttachedEl } from "../../src/runtime/hooks";
-import { makeTestFixture, nextTick, steps, useLogLifecycle } from "../helpers";
-
-let fixture: HTMLElement;
-
-beforeEach(() => {
-  fixture = makeTestFixture();
-});
-
-describe("basics", () => {
-  test("can attach an empty component", async () => {
-    fixture.innerHTML = "<div>hello</div>";
-
-    class Test extends Component {
-      setup() {
-        useLogLifecycle();
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(steps.splice(0)).toMatchInlineSnapshot(`
-      Array [
-        "Test:setup",
-        "Test:willStart",
-        "Test:willRender",
-        "Test:rendered",
-        "Test:mounted",
-      ]
-    `);
-    expect(fixture.innerHTML).toBe("<div>hello</div>");
-  });
-
-  test("attaching a component with a template throws", async () => {
-    fixture.innerHTML = "<div>hello</div>";
-
-    class Test extends Component {
-      static template = xml`hello`;
-    }
-
-    let error: Error | null = null;
-    try {
-      await mount(Test, fixture, { position: "attach" });
-    } catch (e: any) {
-      error = e;
-    }
-    expect(error!.message).toBe("Cannot attach a component with a template");
-
-    expect(fixture.innerHTML).toBe("<div>hello</div>");
-  });
-
-  test("can attach a component with simple dynamic content", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p:t-att-a": "value",
-      };
-      value: string = "";
-      setup() {
-        this.value = "b";
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe('<div><p a="b">hello</p></div>');
-  });
-
-  test("useAttachedEl returns the attached element", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-    let el: any = null;
-
-    class Test extends Component {
-      setup() {
-        el = useAttachedEl();
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(el).toBe(fixture);
-  });
-
-  test("useAttachedEl throws if component is not attached", async () => {
-    class Test extends Component {
-      static template = xml`hello`;
-      setup() {
-        useAttachedEl();
-      }
-    }
-
-    let error: any = null;
-    try {
-      await mount(Test, fixture);
-    } catch (_e: any) {
-      error = _e;
-    }
-
-    expect(error.message).toBe("useAttachedEl can only be called with component that are attached");
-  });
-
-  test("multiple dynamic attribute", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p:t-att-a": "value",
-        "p:t-att-b": "value + 'coucou'",
-      };
-      value: string = "";
-      setup() {
-        this.value = "b";
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe('<div><p a="b" b="bcoucou">hello</p></div>');
-  });
-
-  test("attrs can target root", async () => {
-    fixture.innerHTML = "<p>hello</p>";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "root:t-att-a": "value",
-      };
-      value: string = "";
-      setup() {
-        this.value = "b";
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.outerHTML).toBe('<div a="b"><p>hello</p></div>');
-  });
-
-  test("dynamic attribute is updated on rerender", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p:t-att-a": "state.value",
-      };
-      state: any;
-      setup() {
-        this.state = useState({ value: 1 });
-      }
-    }
-
-    const test = await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe('<div><p a="1">hello</p></div>');
-    test.state.value = 2;
-    await nextTick();
-    expect(fixture.innerHTML).toBe('<div><p a="2">hello</p></div>');
-  });
-
-  test("t-on-click, basic", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-
-    let ev: Event | null = null;
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p:t-att-a": "state.value",
-        "p:t-on-click": "onClick",
-      };
-      state: any;
-      setup() {
-        this.state = useState({ value: 1 });
-      }
-      onClick(_ev: any) {
-        ev = _ev;
-        this.state.value = 2;
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe('<div><p a="1">hello</p></div>');
-    fixture.querySelector("p")!.click();
-    expect(ev).toBeInstanceOf(Event);
-    await nextTick();
-    expect(fixture.innerHTML).toBe('<div><p a="2">hello</p></div>');
-  });
-
-  test("t-on-click, target root element", async () => {
-    fixture.innerHTML = "hello";
-    let click = false;
-    class Test extends Component {
-      static dynamicContent = {
-        "root:t-on-click": "onClick",
-      };
-      onClick() {
-        click = true;
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    fixture.click();
-    expect(click).toBe(true);
-  });
-
-  test("t-out, basic", async () => {
-    fixture.innerHTML = "<div><p>hello</p></div>";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p:t-out": "state.value",
-      };
-      state: any;
-      setup() {
-        this.state = useState({ value: 1 });
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe("<div><p>1</p></div>");
-  });
-
-  test("t-out, on root", async () => {
-    fixture.innerHTML = "hello";
-
-    class Test extends Component {
-      static dynamicContent = {
-        "root:t-out": "state.value",
-      };
-      state: any;
-      setup() {
-        this.state = useState({ value: 1 });
-      }
-    }
-
-    expect(fixture.outerHTML).toBe("<div>hello</div>");
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.outerHTML).toBe("<div>1</div>");
-  });
-
-  test("t-out, with markup", async () => {
-    fixture.innerHTML = `<p class="p1">hello</p><p class="p2">hello</p>`;
-
-    class Test extends Component {
-      static dynamicContent = {
-        "p.p1:t-out": "value1",
-        "p.p2:t-out": "value2",
-      };
-
-      value1: any;
-      value2: any;
-      setup() {
-        this.value1 = "<div>value1</div>";
-        this.value2 = markup("<div>value2</div>");
-      }
-    }
-
-    await mount(Test, fixture, { position: "attach" });
-    expect(fixture.innerHTML).toBe(
-      `<p class="p1">&lt;div&gt;value1&lt;/div&gt;</p><p class="p2"><div>value2</div></p>`
-    );
-  });
-});

tests/components/error_handling.test.ts

@@ -76,8 +76,9 @@ describe("basics", () => {
     }
     const app = new App(Parent);
     let error: Error;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       'Cannot find the definition of component "SomeMispelledComponent"'
     );
     await mountProm;
@@ -96,8 +97,9 @@ describe("basics", () => {
     }
     const app = new App(Parent, { test: true });
     let error: Error;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       'Cannot find the definition of component "SomeMispelledComponent"'
     );
     await mountProm;
@@ -116,8 +118,9 @@ describe("basics", () => {
     }
     const app = new App(Parent as typeof Component);
     let error: Error;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       '"SomeComponent" is not a Component. It must inherit from the Component class'
     );
     await mountProm;
@@ -133,8 +136,9 @@ describe("basics", () => {
     }
     const app = new App(Parent as typeof Component);
     let error: Error;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       'Cannot find the definition of component "MissingChild", missing static components key in parent'
     );
     await mountProm;
@@ -157,7 +161,7 @@ describe("basics", () => {
     } catch (e) {
       error = e as Error;
     }
-    const expectedErrorMessage = `Failed to compile anonymous template: Unexpected identifier 'ctx'
+    const expectedErrorMessage = `Failed to compile anonymous template: Unexpected identifier
 
 generated code:
 function(app, bdom, helpers) {
@@ -182,7 +186,7 @@ function(app, bdom, helpers) {
       static components = { Child };
       static template = xml`<Child/>`;
     }
-    const expectedErrorMessage = `Failed to compile anonymous template: Unexpected identifier 'ctx'
+    const expectedErrorMessage = `Failed to compile anonymous template: Unexpected identifier
 
 generated code:
 function(app, bdom, helpers) {
@@ -197,8 +201,9 @@ function(app, bdom, helpers) {
 }`;
     const app = new App(Parent as typeof Component);
     let error: Error;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(expectedErrorMessage);
+    await expect(appError).resolves.toThrow(expectedErrorMessage);
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(expectedErrorMessage);
@@ -244,8 +249,9 @@ describe("errors and promises", () => {
 
     const app = new App(Root);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();
@@ -268,8 +274,9 @@ describe("errors and promises", () => {
 
     const app = new App(Root);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();
@@ -291,8 +298,9 @@ describe("errors and promises", () => {
 
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onMounted");
+    await expect(appError).resolves.toThrow("error occurred in onMounted");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.stack).toContain("Root.setup");
@@ -317,8 +325,9 @@ describe("errors and promises", () => {
 
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onWillRender");
+    await expect(appError).resolves.toThrow("error occurred in onWillRender");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -358,8 +367,9 @@ describe("errors and promises", () => {
 
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onWillStart");
+    await expect(appError).resolves.toThrow("error occurred in onWillStart");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -426,8 +436,9 @@ describe("errors and promises", () => {
 
     const app = new App(Parent);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();
@@ -472,8 +483,9 @@ describe("errors and promises", () => {
 
     const app = new App(Parent);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();
@@ -502,8 +514,9 @@ describe("errors and promises", () => {
 
     const app = new App(Example, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onMounted");
+    await expect(appError).resolves.toThrow("error occurred in onMounted");
     await mountProm;
     expect(error!.message).toBe(`The following error occurred in onMounted: "Error in mounted"`);
     // 1 additional error is logged because the destruction of the app causes
@@ -577,9 +590,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root, { test: true });
     let error: OwlError;
-    const crashProm = expect(nextAppError(app)).resolves.toThrow("error occurred in onWillStart");
+    const appError = nextAppError(app);
     await app.mount(fixture).catch((e: Error) => (error = e));
-    await crashProm;
+    await expect(appError).resolves.toThrow("error occurred in onWillStart");
     expect(error!.message).toBe(
       `The following error occurred in onWillStart: "No active component (a hook function should only be called in 'setup')"`
     );
@@ -599,8 +612,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onMounted");
+    await expect(appError).resolves.toThrow("error occurred in onMounted");
     await mountProm;
     expect(error!.message).toBe(`The following error occurred in onMounted: "test error"`);
     expect(error!.cause).toBe(err);
@@ -621,8 +635,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occurred in onWillStart");
+    await expect(appError).resolves.toThrow("error occurred in onWillStart");
     await mountProm;
     expect(error!.message).toBe(`The following error occurred in onWillStart: "test error"`);
     expect(error!.cause).toBe(err);
@@ -642,8 +657,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!.message).toBe(
       `An error occured in the owl lifecycle (see this Error's "cause" property)`
@@ -666,8 +682,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!.message).toBe(
       `An error occured in the owl lifecycle (see this Error's "cause" property)`
@@ -688,8 +705,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root, { test: true });
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("not an Error was thrown in onMounted");
+    await expect(appError).resolves.toThrow("not an Error was thrown in onMounted");
     await mountProm;
     expect(error!.message).toBe(
       `Something that is not an Error was thrown in onMounted (see this Error's "cause" property)`
@@ -710,8 +728,9 @@ describe("can catch errors", () => {
     }
     const app = new App(Root);
     let error: OwlError;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!.message).toBe(
       `An error occured in the owl lifecycle (see this Error's "cause" property)`
@@ -956,13 +975,13 @@ describe("can catch errors", () => {
         "Root:willRender",
         "ErrorBoundary:setup",
         "ErrorBoundary:willStart",
-        "Root:rendered",
         "ErrorBoundary:willRender",
         "ErrorComponent:setup",
         "ErrorComponent:willStart",
-        "ErrorBoundary:rendered",
         "ErrorComponent:willRender",
         "ErrorComponent:rendered",
+        "ErrorBoundary:rendered",
+        "Root:rendered",
         "ErrorComponent:mounted",
         "boom",
         "ErrorBoundary:willRender",
@@ -1008,9 +1027,9 @@ describe("can catch errors", () => {
         "Root:willRender",
         "ErrorComponent:setup",
         "ErrorComponent:willStart",
-        "Root:rendered",
         "ErrorComponent:willRender",
         "ErrorComponent:rendered",
+        "Root:rendered",
         "ErrorComponent:mounted",
         "boom",
         "Root:willRender",
@@ -1071,17 +1090,17 @@ describe("can catch errors", () => {
         "A:willRender",
         "B:setup",
         "B:willStart",
-        "A:rendered",
         "B:willRender",
         "C:setup",
         "C:willStart",
-        "B:rendered",
         "C:willRender",
         "Boom:setup",
         "Boom:willStart",
-        "C:rendered",
         "Boom:willRender",
         "Boom:rendered",
+        "C:rendered",
+        "B:rendered",
+        "A:rendered",
         "Boom:mounted",
         "boom",
         "C:willRender",
@@ -1144,17 +1163,17 @@ describe("can catch errors", () => {
         "Root:willRender",
         "OK:setup",
         "OK:willStart",
-        "ErrorBoundary:setup",
-        "ErrorBoundary:willStart",
-        "Root:rendered",
         "OK:willRender",
         "OK:rendered",
+        "ErrorBoundary:setup",
+        "ErrorBoundary:willStart",
         "ErrorBoundary:willRender",
         "ErrorComponent:setup",
         "ErrorComponent:willStart",
-        "ErrorBoundary:rendered",
         "ErrorComponent:willRender",
         "ErrorComponent:rendered",
+        "ErrorBoundary:rendered",
+        "Root:rendered",
         "ErrorComponent:mounted",
         "boom",
         "ErrorBoundary:willRender",
@@ -1497,9 +1516,9 @@ describe("can catch errors", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -1576,9 +1595,9 @@ describe("can catch errors", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
       ]
     `);
     parent.state.hasChild = false;

tests/components/hooks.test.ts

@@ -641,56 +641,6 @@ 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 () => {
       let originalconsoleError = console.error;
       let originalconsoleWarn = console.warn;
@@ -710,8 +660,9 @@ describe("hooks", () => {
 
       let error: OwlError;
       const app = new App(MyComponent);
+      const appError = nextAppError(app);
       const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-      await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+      await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
       await mountProm;
       expect(error!.cause.message).toBe("Intentional error");
       // no console.error because the error has been caught in this test
@@ -723,5 +674,3 @@ describe("hooks", () => {
     });
   });
 });
-
-function expectType<T>(t: T) {}

tests/components/lifecycle.test.ts

@@ -1,9 +1,5 @@
+import { App, Component, mount, onMounted, onWillStart, useState, xml } from "../../src";
 import {
-  App,
-  Component,
-  mount,
-  useState,
-  xml,
   onWillPatch,
   onWillUnmount,
   onPatched,
@@ -11,9 +7,7 @@ import {
   onWillRender,
   onWillDestroy,
   onRendered,
-  onMounted,
-  onWillStart,
-} from "../../src";
+} from "../../src/runtime/lifecycle_hooks";
 import { status } from "../../src/runtime/status";
 import {
   elem,
@@ -112,10 +106,10 @@ describe("lifecycle hooks", () => {
     await mount(Test, fixture);
   });
 
-  test("timeout in onWillStart emits a console log", async () => {
-    const { log } = console;
-    let logArgs: any[];
-    console.log = jest.fn((...args) => (logArgs = args));
+  test("timeout in onWillStart emits a warning", async () => {
+    const { warn } = console;
+    let warnArgs: any[];
+    console.warn = jest.fn((...args) => (warnArgs = args));
     const { setTimeout } = window;
     let timeoutCbs: any = {};
     let timeoutId = 0;
@@ -123,63 +117,27 @@ describe("lifecycle hooks", () => {
       timeoutCbs[++timeoutId] = cb;
       return timeoutId;
     }) as any;
-    try {
-      class Test extends Component {
-        static template = xml`<span/>`;
-        setup() {
-          onWillStart(() => new Promise(() => {}));
-        }
+    class Test extends Component {
+      static template = xml`<span/>`;
+      setup() {
+        onWillStart(() => new Promise(() => {}));
       }
-      mount(Test, fixture, { test: true });
-      nextTick();
-      for (const id in timeoutCbs) {
-        timeoutCbs[id]();
-        delete timeoutCbs[id];
-      }
-      await nextMicroTick();
-      await nextMicroTick();
-      expect(console.log).toHaveBeenCalledTimes(1);
-      expect(logArgs![0]!.message).toBe("onWillStart's promise hasn't resolved after 3 seconds");
-    } finally {
-      console.log = log;
-      window.setTimeout = setTimeout;
     }
+    mount(Test, fixture, { test: true });
+    nextTick();
+    for (const id in timeoutCbs) {
+      timeoutCbs[id]();
+      delete timeoutCbs[id];
+    }
+    await nextMicroTick();
+    await nextMicroTick();
+    expect(console.warn).toHaveBeenCalledTimes(1);
+    expect(warnArgs![0]!.message).toBe("onWillStart's promise hasn't resolved after 3 seconds");
+    console.warn = warn;
+    window.setTimeout = setTimeout;
   });
 
-  test("timeout in onWillStart doesn't emit a console log if app is destroyed", async () => {
-    const { log } = console;
-    console.log = jest.fn();
-    const { setTimeout } = window;
-    let timeoutCbs: any = {};
-    let timeoutId = 0;
-    window.setTimeout = ((cb: any) => {
-      timeoutCbs[++timeoutId] = cb;
-      return timeoutId;
-    }) as any;
-    try {
-      class Test extends Component {
-        static template = xml`<span/>`;
-        setup() {
-          onWillStart(() => new Promise(() => {}));
-        }
-      }
-      const app = new App(Test, { test: true });
-      app.mount(fixture);
-      app.destroy();
-      for (const id in timeoutCbs) {
-        timeoutCbs[id]();
-        delete timeoutCbs[id];
-      }
-      await nextMicroTick();
-      await nextMicroTick();
-      expect(console.log).toHaveBeenCalledTimes(0);
-    } finally {
-      console.log = log;
-      window.setTimeout = setTimeout;
-    }
-  });
-
-  test("timeout in onWillUpdateProps emits a console log", async () => {
+  test("timeout in onWillUpdateProps emits a warning", async () => {
     class Child extends Component {
       static template = xml``;
       setup() {
@@ -193,9 +151,9 @@ describe("lifecycle hooks", () => {
     }
     const parent = await mount(Parent, fixture, { test: true });
 
-    const { log } = console;
-    let logArgs: any[];
-    console.log = jest.fn((...args) => (logArgs = args));
+    const { warn } = console;
+    let warnArgs: any[];
+    console.warn = jest.fn((...args) => (warnArgs = args));
     const { setTimeout } = window;
     let timeoutCbs: any = {};
     let timeoutId = 0;
@@ -204,28 +162,25 @@ describe("lifecycle hooks", () => {
       return timeoutId;
     }) as any;
 
-    try {
-      parent.state.prop = 2;
-      let tick = nextTick();
-      for (const id in timeoutCbs) {
-        timeoutCbs[id]();
-        delete timeoutCbs[id];
-      }
-      await tick;
-      tick = nextTick();
-      for (const id in timeoutCbs) {
-        timeoutCbs[id]();
-        delete timeoutCbs[id];
-      }
-      await tick;
-      expect(console.log).toHaveBeenCalledTimes(1);
-      expect(logArgs![0]!.message).toBe(
-        "onWillUpdateProps's promise hasn't resolved after 3 seconds"
-      );
-    } finally {
-      console.log = log;
-      window.setTimeout = setTimeout;
+    parent.state.prop = 2;
+    let tick = nextTick();
+    for (const id in timeoutCbs) {
+      timeoutCbs[id]();
+      delete timeoutCbs[id];
     }
+    await tick;
+    tick = nextTick();
+    for (const id in timeoutCbs) {
+      timeoutCbs[id]();
+      delete timeoutCbs[id];
+    }
+    await tick;
+    expect(console.warn).toHaveBeenCalledTimes(1);
+    expect(warnArgs![0]!.message).toBe(
+      "onWillUpdateProps's promise hasn't resolved after 3 seconds"
+    );
+    console.warn = warn;
+    window.setTimeout = setTimeout;
   });
 
   test("mounted hook is called if mounted in DOM", async () => {
@@ -387,15 +342,16 @@ describe("lifecycle hooks", () => {
     parent.state.n = 2;
     await nextTick();
     app.destroy();
-    expect(steps).toEqual([
-      "parent:willPatch",
-      "child:willPatch",
-      "childchild:willPatch",
-      "childchild:patched",
-      "child:patched",
-      "parent:patched",
-    ]);
-    Object.freeze(steps);
+    expect(steps.splice(0)).toMatchInlineSnapshot(`
+      Array [
+        "parent:willPatch",
+        "childchild:willPatch",
+        "child:willPatch",
+        "child:patched",
+        "childchild:patched",
+        "parent:patched",
+      ]
+    `);
   });
 
   test("willStart, mounted on subwidget rendered after main is mounted in some other position", async () => {
@@ -508,9 +464,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -523,9 +479,9 @@ describe("lifecycle hooks", () => {
       Array [
         "Parent:willRender",
         "Child:willUpdateProps",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "Child:willPatch",
         "Child:patched",
@@ -573,9 +529,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -695,9 +651,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -757,13 +713,13 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "GrandChild:setup",
         "GrandChild:willStart",
-        "Child:rendered",
         "GrandChild:willRender",
         "GrandChild:rendered",
+        "Child:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "GrandChild:mounted",
         "Child:mounted",
@@ -879,11 +835,11 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "GrandChild:setup",
         "GrandChild:willStart",
         "Child:rendered",
+        "Parent:rendered",
       ]
     `);
 
@@ -923,9 +879,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -970,9 +926,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -984,9 +940,9 @@ describe("lifecycle hooks", () => {
       Array [
         "Parent:willRender",
         "Child:willUpdateProps",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "Child:willPatch",
         "Child:patched",
@@ -1031,9 +987,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -1158,21 +1114,21 @@ describe("lifecycle hooks", () => {
         "A:willRender",
         "B:setup",
         "B:willStart",
-        "C:setup",
-        "C:willStart",
-        "A:rendered",
         "B:willRender",
         "B:rendered",
+        "C:setup",
+        "C:willStart",
         "C:willRender",
         "D:setup",
         "D:willStart",
-        "E:setup",
-        "E:willStart",
-        "C:rendered",
         "D:willRender",
         "D:rendered",
+        "E:setup",
+        "E:willStart",
         "E:willRender",
         "E:rendered",
+        "C:rendered",
+        "A:rendered",
         "E:mounted",
         "D:mounted",
         "C:mounted",
@@ -1189,9 +1145,9 @@ describe("lifecycle hooks", () => {
         "C:willRender",
         "F:setup",
         "F:willStart",
-        "C:rendered",
         "F:willRender",
         "F:rendered",
+        "C:rendered",
         "C:willPatch",
         "E:willUnmount",
         "E:willDestroy",
@@ -1226,9 +1182,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -1254,9 +1210,9 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "Child:mounted",
         "Parent:patched",
@@ -1510,6 +1466,8 @@ describe("lifecycle hooks", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Parent:rendered",
         "Parent:willUnmount",
         "Child:willDestroy",

tests/components/props.test.ts

@@ -279,9 +279,9 @@ test("bound functions are considered 'alike'", async () => {
       "Parent:willRender",
       "Child:setup",
       "Child:willStart",
-      "Parent:rendered",
       "Child:willRender",
       "Child:rendered",
+      "Parent:rendered",
       "Child:mounted",
       "Parent:mounted",
     ]
@@ -299,34 +299,6 @@ test("bound functions are considered 'alike'", async () => {
   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 () => {
   class Child extends Component {
     static template = xml`<t t-esc="props.val"/>`;
@@ -369,9 +341,9 @@ test(".alike suffix in a simple case", async () => {
       "Parent:willRender",
       "Child:setup",
       "Child:willStart",
-      "Parent:rendered",
       "Child:willRender",
       "Child:rendered",
+      "Parent:rendered",
       "Child:mounted",
       "Parent:mounted",
     ]
@@ -431,13 +403,13 @@ test(".alike suffix in a list", async () => {
       "Parent:willRender",
       "Todo:setup",
       "Todo:willStart",
+      "Todo:willRender",
+      "Todo:rendered",
       "Todo:setup",
       "Todo:willStart",
+      "Todo:willRender",
+      "Todo:rendered",
       "Parent:rendered",
-      "Todo:willRender",
-      "Todo:rendered",
-      "Todo:willRender",
-      "Todo:rendered",
       "Todo:mounted",
       "Todo:mounted",
       "Parent:mounted",

tests/components/props_validation.test.ts

@@ -51,8 +51,9 @@ describe("props validation", () => {
 
     const app = new App(Parent, { test: true });
     let error: OwlError | undefined;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       "Invalid props for component 'SubComp': 'message' is missing"
     );
     await mountProm;
@@ -80,8 +81,9 @@ describe("props validation", () => {
 
     const app = new App(Parent, { test: true });
     let error: OwlError | undefined;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       "Invalid props for component 'SubComp': 'message' is missing"
     );
     await mountProm;
@@ -131,8 +133,9 @@ describe("props validation", () => {
       props = {};
       let app = new App(Parent, { test: true });
       let error: OwlError | undefined;
+      let appError = nextAppError(app);
       let mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-      await expect(nextAppError(app)).resolves.toThrow("Invalid props for component '_a'");
+      await expect(appError).resolves.toThrow("Invalid props for component '_a'");
       await mountProm;
       expect(error!).toBeDefined();
       expect(error!.message).toBe(
@@ -148,8 +151,9 @@ describe("props validation", () => {
       expect(error!).toBeUndefined();
       props = { p: test.ko };
       app = new App(Parent, { test: true });
+      appError = nextAppError(app);
       mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-      await expect(nextAppError(app)).resolves.toThrow("Invalid props for component '_a'");
+      await expect(appError).resolves.toThrow("Invalid props for component '_a'");
       await mountProm;
       expect(error!).toBeDefined();
       expect(error!.message).toBe(
@@ -183,8 +187,9 @@ describe("props validation", () => {
       props = {};
       let app = new App(Parent, { test: true });
       let error: OwlError | undefined;
+      let appError = nextAppError(app);
       let mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-      await expect(nextAppError(app)).resolves.toThrow("Invalid props for component '_a'");
+      await expect(appError).resolves.toThrow("Invalid props for component '_a'");
       await mountProm;
       expect(error!).toBeDefined();
       expect(error!.message).toBe(
@@ -200,8 +205,9 @@ describe("props validation", () => {
       expect(error!).toBeUndefined();
       props = { p: test.ko };
       app = new App(Parent, { test: true });
+      appError = nextAppError(app);
       mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-      await expect(nextAppError(app)).resolves.toThrow("Invalid props for component '_a'");
+      await expect(appError).resolves.toThrow("Invalid props for component '_a'");
       await mountProm;
       expect(error!).toBeDefined();
       expect(error!.message).toBe(
@@ -240,8 +246,9 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: 1 };
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -279,8 +286,9 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: 1 };
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe("Invalid props for component 'SubComp': 'p' is not a string");
@@ -316,14 +324,16 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: [1] };
     let app = new App(Parent, { test: true });
+    let appError = nextAppError(app);
     let mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     error = undefined;
     app = new App(Parent, { test: true });
+    appError = nextAppError(app);
     mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
   });
@@ -365,8 +375,9 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: [true, 1] };
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -399,8 +410,9 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: { id: 1, url: "url", extra: true } };
     let app = new App(Parent, { test: true });
+    let appError = nextAppError(app);
     let mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -408,8 +420,9 @@ describe("props validation", () => {
     );
     props = { p: { id: "1", url: "url" } };
     app = new App(Parent, { test: true });
+    appError = nextAppError(app);
     mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -418,8 +431,9 @@ describe("props validation", () => {
     error = undefined;
     props = { p: { id: 1 } };
     app = new App(Parent, { test: true });
+    appError = nextAppError(app);
     mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -465,8 +479,9 @@ describe("props validation", () => {
     expect(error!).toBeUndefined();
     props = { p: { id: 1, url: [12, true] } };
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -594,7 +609,7 @@ describe("props validation", () => {
 
   test("props: can be defined with a boolean", async () => {
     class SubComp extends Component {
-      static props = { message: true } as const;
+      static props = { message: true };
     }
     expect(() => {
       validateProps(SubComp as any, {});
@@ -636,7 +651,7 @@ describe("props validation", () => {
 
   test("props: extra props cause an error, part 2", async () => {
     class SubComp extends Component {
-      static props = { message: true } as const;
+      static props = { message: true };
     }
     expect(() => {
       validateProps(SubComp as any, { message: 1, flag: true });
@@ -675,8 +690,9 @@ describe("props validation", () => {
     }
     let error: Error;
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'SubComp'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'SubComp'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe("Invalid props for component 'SubComp': 'p' is missing");
@@ -702,7 +718,7 @@ describe("props validation", () => {
     const app = new App(Parent, { test: true });
     await app.mount(fixture);
     expect(fixture.innerHTML).toBe("12");
-    expect(app.root!.node!.subscriptions).toEqual([{ keys: ["otherValue"], target: obj }]);
+    expect(app.root!.subscriptions).toEqual([{ keys: ["otherValue"], target: obj }]);
   });
 
   test("props are validated whenever component is updated", async () => {
@@ -765,8 +781,9 @@ describe("props validation", () => {
     }
     let error: Error;
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("Invalid props for component 'Child'");
+    await expect(appError).resolves.toThrow("Invalid props for component 'Child'");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(
@@ -821,60 +838,15 @@ describe("props validation", () => {
 
     const app = new App(Parent, { test: true });
     let error: OwlError | undefined;
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       "Invalid props for component 'Child': 'message' is missing"
     );
     await mountProm;
     expect(error!).toBeDefined();
     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"
-    );
-  });
 });
 
 //------------------------------------------------------------------------------
@@ -941,10 +913,9 @@ describe("default props", () => {
     }
     let error: Error;
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow(
-      "default value cannot be defined for a mandatory prop"
-    );
+    await expect(appError).resolves.toThrow("default value cannot be defined for a mandatory prop");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(

tests/components/reactivity.test.ts

@@ -151,9 +151,10 @@ describe("reactivity in lifecycle", () => {
       }
     }
     const prom = mount(Comp, fixture);
+    expect(steps).toEqual([1]);
     (STATE as any).val = 2;
     await prom;
-    expect(steps).toEqual([2]);
+    expect(steps).toEqual([1, 2]);
     expect(fixture.innerHTML).toBe("<div>2</div>");
   });
 
@@ -182,9 +183,9 @@ describe("reactivity in lifecycle", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]

tests/components/refs.test.ts

@@ -125,10 +125,11 @@ describe("refs", () => {
     }
 
     const app = new App(Test, { test: true });
+    const appError = nextAppError(app);
     const mountProm = expect(app.mount(fixture)).rejects.toThrowError(
       'Cannot set the same ref more than once in the same component, ref "coucou" was set multiple times in Test'
     );
-    await expect(nextAppError(app)).resolves.toThrow(
+    await expect(appError).resolves.toThrow(
       'Cannot set the same ref more than once in the same component, ref "coucou" was set multiple times in Test'
     );
     await mountProm;

tests/components/rendering.test.ts

@@ -49,9 +49,9 @@ describe("rendering semantics", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -179,9 +179,9 @@ describe("rendering semantics", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -198,9 +198,9 @@ describe("rendering semantics", () => {
       Array [
         "Parent:willRender",
         "Child:willUpdateProps",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
       ]
     `);
 
@@ -213,9 +213,9 @@ describe("rendering semantics", () => {
       Array [
         "Parent:willRender",
         "Child:willUpdateProps",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "Child:willPatch",
         "Child:patched",
@@ -253,9 +253,9 @@ describe("rendering semantics", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -305,9 +305,9 @@ describe("rendering semantics", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -404,13 +404,13 @@ describe("rendering semantics", () => {
         "A:willRender",
         "B:setup",
         "B:willStart",
-        "A:rendered",
         "B:willRender",
         "C:setup",
         "C:willStart",
-        "B:rendered",
         "C:willRender",
         "C:rendered",
+        "B:rendered",
+        "A:rendered",
         "C:mounted",
         "B:mounted",
         "A:mounted",
@@ -473,13 +473,13 @@ test("force render in case of existing render", async () => {
       "A:willRender",
       "B:setup",
       "B:willStart",
-      "A:rendered",
       "B:willRender",
       "C:setup",
       "C:willStart",
-      "B:rendered",
       "C:willRender",
       "C:rendered",
+      "B:rendered",
+      "A:rendered",
       "C:mounted",
       "B:mounted",
       "A:mounted",
@@ -516,14 +516,14 @@ test("force render in case of existing render", async () => {
     Array [
       "B:willRender",
       "C:willUpdateProps",
-      "B:rendered",
       "C:willRender",
       "C:rendered",
+      "B:rendered",
       "A:willPatch",
-      "B:willPatch",
       "C:willPatch",
-      "C:patched",
+      "B:willPatch",
       "B:patched",
+      "C:patched",
       "A:patched",
     ]
   `);
@@ -561,9 +561,9 @@ test("children, default props and renderings", async () => {
       "Parent:willRender",
       "Child:setup",
       "Child:willStart",
-      "Parent:rendered",
       "Child:willRender",
       "Child:rendered",
+      "Parent:rendered",
       "Child:mounted",
       "Parent:mounted",
     ]

tests/components/slots.test.ts

@@ -179,34 +179,6 @@ describe("slots", () => {
     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 () => {
     let child: any;
     class Child extends Component {
@@ -251,8 +223,9 @@ describe("slots", () => {
 
     let error: Error;
     const app = new App(Parent);
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).not.toBeNull();
     expect(mockConsoleWarn).toBeCalledTimes(1);
@@ -1701,31 +1674,6 @@ describe("slots", () => {
     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 () => {
     class Parent extends Component {
       static template = xml`<t t-slot="default"/>`;

tests/components/style_class.test.ts

@@ -349,8 +349,9 @@ describe("style and class handling", () => {
     }
     let error: OwlError;
     const app = new App(Parent);
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();

tests/components/t_component.test.ts

@@ -36,9 +36,9 @@ describe("t-component", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]
@@ -77,9 +77,9 @@ describe("t-component", () => {
         "Parent:willRender",
         "ChildA:setup",
         "ChildA:willStart",
-        "Parent:rendered",
         "ChildA:willRender",
         "ChildA:rendered",
+        "Parent:rendered",
         "ChildA:mounted",
         "Parent:mounted",
       ]
@@ -94,9 +94,9 @@ describe("t-component", () => {
         "Parent:willRender",
         "ChildB:setup",
         "ChildB:willStart",
-        "Parent:rendered",
         "ChildB:willRender",
         "ChildB:rendered",
+        "Parent:rendered",
         "Parent:willPatch",
         "ChildA:willUnmount",
         "ChildA:willDestroy",

tests/components/t_foreach.test.ts

@@ -99,13 +99,13 @@ describe("list of components", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Parent:rendered",
-        "Child:willRender",
-        "Child:rendered",
-        "Child:willRender",
-        "Child:rendered",
         "Child:mounted",
         "Child:mounted",
         "Parent:mounted",
@@ -326,10 +326,11 @@ describe("list of components", () => {
     }
 
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = expect(app.mount(fixture)).rejects.toThrow(
       "Got duplicate key in t-foreach: child"
     );
-    await expect(nextAppError(app)).resolves.toThrow("Got duplicate key in t-foreach: child");
+    await expect(appError).resolves.toThrow("Got duplicate key in t-foreach: child");
     await mountProm;
     console.info = consoleInfo;
     expect(mockConsoleWarn).toBeCalledTimes(1);
@@ -352,12 +353,11 @@ describe("list of components", () => {
     }
 
     const app = new App(Parent, { test: true });
+    const appError = nextAppError(app);
     const mountProm = expect(app.mount(fixture)).rejects.toThrow(
       "Got duplicate key in t-foreach: [object Object]"
     );
-    await expect(nextAppError(app)).resolves.toThrow(
-      "Got duplicate key in t-foreach: [object Object]"
-    );
+    await expect(appError).resolves.toThrow("Got duplicate key in t-foreach: [object Object]");
     await mountProm;
     console.info = consoleInfo;
     expect(mockConsoleWarn).toBeCalledTimes(1);

tests/components/t_model.test.ts

@@ -331,32 +331,6 @@ describe("t-model directive", () => {
     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 () => {
     class SomeComponent extends Component {
       static template = xml`

tests/helpers.ts

@@ -235,7 +235,7 @@ expect.extend({
     };
 
     const currentSteps = steps.splice(0);
-    const pass = this.equals(currentSteps, expected);
+    let pass = this.equals(currentSteps, expected);
 
     const message = pass
       ? () =>

tests/misc/portal.test.ts

@@ -270,8 +270,9 @@ describe("Portal", () => {
 
     let error: Error;
     const app = new App(Parent);
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("invalid portal target");
+    await expect(appError).resolves.toThrow("invalid portal target");
     await mountProm;
 
     expect(error!).toBeDefined();
@@ -1002,8 +1003,9 @@ describe("Portal: Props validation", () => {
     }
     let error: OwlError;
     const app = new App(Parent);
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("error occured in the owl lifecycle");
+    await expect(appError).resolves.toThrow("error occured in the owl lifecycle");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.cause).toBeDefined();
@@ -1021,8 +1023,9 @@ describe("Portal: Props validation", () => {
     }
     let error: Error;
     const app = new App(Parent);
+    const appError = nextAppError(app);
     const mountProm = app.mount(fixture).catch((e: Error) => (error = e));
-    await expect(nextAppError(app)).resolves.toThrow("invalid portal target");
+    await expect(appError).resolves.toThrow("invalid portal target");
     await mountProm;
     expect(error!).toBeDefined();
     expect(error!.message).toBe(`invalid portal target`);

tests/reactivity.test.ts

@@ -993,33 +993,32 @@ describe("Reactivity", () => {
     const obj2 = createReactive({ b: {} }, () => n2++);
     const obj3 = createReactive({ c: {} }, () => n3++);
 
-    // assign the same object should'nt notify reactivity
     obj2.b = obj2.b;
     obj2.b;
     obj3.c = obj3.c;
     obj3.c;
     expect(n1).toBe(0);
-    expect(n2).toBe(0);
-    expect(n3).toBe(0);
+    expect(n2).toBe(1);
+    expect(n3).toBe(1);
 
     obj2.b = obj1;
     obj2.b;
     obj3.c = obj1;
     obj3.c;
     expect(n1).toBe(0);
-    expect(n2).toBe(1);
-    expect(n3).toBe(1);
+    expect(n2).toBe(2);
+    expect(n3).toBe(2);
 
     obj1.a = obj1.a + 2;
     obj1.a;
     expect(n1).toBe(1);
-    expect(n2).toBe(1);
-    expect(n3).toBe(1);
+    expect(n2).toBe(2);
+    expect(n3).toBe(2);
 
     obj2.b.a = obj2.b.a + 1;
     expect(n1).toBe(2);
-    expect(n2).toBe(2);
-    expect(n3).toBe(1);
+    expect(n2).toBe(3);
+    expect(n3).toBe(2);
   });
 
   test("reactive inside other: reading the inner reactive from outer doesn't affect the inner's subscriptions", async () => {
@@ -1859,13 +1858,13 @@ describe("Reactivity: useState", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Parent:rendered",
-        "Child:willRender",
-        "Child:rendered",
-        "Child:willRender",
-        "Child:rendered",
         "Child:mounted",
         "Child:mounted",
         "Parent:mounted",
@@ -1917,13 +1916,13 @@ describe("Reactivity: useState", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Child:setup",
         "Child:willStart",
+        "Child:willRender",
+        "Child:rendered",
         "Parent:rendered",
-        "Child:willRender",
-        "Child:rendered",
-        "Child:willRender",
-        "Child:rendered",
         "Child:mounted",
         "Child:mounted",
         "Parent:mounted",
@@ -1993,17 +1992,17 @@ describe("Reactivity: useState", () => {
         "GrandFather:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:setup",
-        "Parent:willStart",
-        "GrandFather:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:setup",
+        "Parent:willStart",
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
+        "GrandFather:rendered",
         "Child:mounted",
         "Parent:mounted",
         "Child:mounted",
@@ -2216,9 +2215,9 @@ describe("Reactivity: useState", () => {
         "Parent:willRender",
         "Child:setup",
         "Child:willStart",
-        "Parent:rendered",
         "Child:willRender",
         "Child:rendered",
+        "Parent:rendered",
         "Child:mounted",
         "Parent:mounted",
       ]

tools/devtools/manifest-chrome.json

@@ -1,6 +1,6 @@
 {
   "name": "Owl devtools",
-  "version": "1.2.2",
+  "version": "1.2.1",
   "manifest_version": 3,
   "description": "Chrome devtools extension for Odoo Owl framework",
   "icons": {
@@ -14,7 +14,7 @@
     "default_popup": "popup_app/popup.html"
   },
   "permissions": ["scripting", "storage"],
-  "host_permissions": ["http://*/*", "https://*/*", "file://*"],
+  "host_permissions": ["http://*/*", "https://*/*"],
   "content_security_policy": {
     "script-src": "self",
     "object-src": "self"

tools/devtools/manifest-firefox.json

@@ -1,6 +1,6 @@
 {
   "name": "Owl devtools",
-  "version": "1.0.0",
+  "version": "1.0",
   "description": "Firefox devtools extension for Odoo Owl framework",
   "manifest_version": 2,
   "browser_specific_settings": {
@@ -29,7 +29,7 @@
     "scripts": ["background.js"]
   },
   "devtools_page": "devtools_app/devtools.html",
-  "content_security_policy": "script-src 'self'; object-src 'self'",
+  "content_security_policy": "script-src 'self' 'unsafe-eval' blob:; object-src 'self'",
   "content_scripts": [
     {
       "matches": ["<all_urls>"],

tools/devtools/src/background.js

@@ -1,7 +1,9 @@
-import { IS_FIREFOX, getActiveTabURL, browserInstance } from "./utils";
+import { IS_FIREFOX, getActiveTabURL } from "./utils";
 
 let owlStatus = 0;
 
+const browserInstance = IS_FIREFOX ? browser : chrome;
+
 // Used to keep track of the tabs where the owl devtools have been opened
 const activePanels = new Map();
 
@@ -69,9 +71,6 @@ function checkOwlStatus(tabId) {
 browserInstance.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
   // Send back the owl status to the sender
   if (message.type === "getOwlStatus") {
-    if (IS_FIREFOX) {
-      return { result: owlStatus };
-    }
     sendResponse({ result: owlStatus });
     return true;
   } else if (message.type === "owlStatus") {
@@ -113,10 +112,11 @@ browserInstance.runtime.onMessage.addListener(async (message, sender, sendRespon
     }, 750);
     activePanels.set(message.id, { port: port, expirationTimeout: expirationTimeout });
     // 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") {
-    const tab = await getActiveTabURL();
-    return { result: tab };
+    getActiveTabURL().then((tab) => {
+      sendResponse({ result: tab });
+    });
+    return true;
   } else {
     const destinationPanel = activePanels.get(sender.tab.id);
     if (destinationPanel) {

tools/devtools/src/content.js

@@ -1,5 +1,5 @@
 import globalHook from "./page_scripts/owl_devtools_global_hook";
-import { IS_FIREFOX, browserInstance } from "./utils";
+import { IS_FIREFOX } from "./utils";
 
 // Relays the owlDevtools__... type top window messages to the background script so that it can relay it to the devtools app
 window.addEventListener(
@@ -7,7 +7,7 @@ window.addEventListener(
   function (event) {
     if (event.data.type && event.data.source === "owl-devtools") {
       try {
-        browserInstance.runtime.sendMessage(
+        chrome.runtime.sendMessage(
           event.data.data
             ? { type: event.data.type, data: event.data.data, origin: event.data.origin }
             : { type: event.data.type, origin: event.data.origin }

tools/devtools/src/devtools_app/devtools.js

@@ -1,6 +1,7 @@
-import { IS_FIREFOX, browserInstance } from "../utils";
+import { IS_FIREFOX } from "../utils";
 
 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
 const checkInterval = setInterval(createPanelsIfOwl, 1000);

tools/devtools/src/devtools_app/devtools_window/components_tab/component_search_bar/component_search_bar.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
   <t t-name="devtools.ComponentSearchBar" owl="1">
-    <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-fw fa-mouse-pointer" t-attf-style="color: {{store.componentSearch.activeSelector ? 'var(--active-icon)' : 'var(--text-color)'}};"></i>
+    <div class="pointer-icon ms-1 px-2 py-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>
     </div>
     <div class="icons-separator"/>
     <div class="d-flex align-items-center ms-2 flex-grow-1">

tools/devtools/src/devtools_app/devtools_window/components_tab/components_tab.js

@@ -15,7 +15,6 @@ export class ComponentsTab extends Component {
     this.store = useStore();
     this.flushRendersTimeout = false;
     useExternalListener(document, "keydown", this.onKeyboardEvent);
-    useExternalListener(window, "resize", this.onWindowResize);
 
     onWillUnmount(() => {
       window.removeEventListener("mousemove", this.onMouseMove);
@@ -54,11 +53,9 @@ export class ComponentsTab extends Component {
 
   // Adjust the position of the split between the left and right right window of the components tab
   onMouseMove = (event) => {
-    const minWidth = (147 / window.innerWidth) * 100;
-    const maxWidth = 100 - (100 / window.innerWidth) * 100;
     this.store.splitPosition = Math.max(
-      Math.min((event.clientX / window.innerWidth) * 100, maxWidth),
-      minWidth
+      Math.min((event.clientX / window.innerWidth) * 100, 85),
+      15
     );
   };
 
@@ -67,11 +64,4 @@ export class ComponentsTab extends Component {
     window.removeEventListener("mousemove", this.onMouseMove);
     window.removeEventListener("mouseup", this.onMouseUp);
   };
-
-  onWindowResize = () => {
-    const minWidth = (147 / window.innerWidth) * 100;
-    if (minWidth <= 100) {
-      this.store.splitPosition = Math.max(this.store.splitPosition, minWidth);
-    }
-  };
 }

tools/devtools/src/devtools_app/devtools_window/components_tab/details_window/object_tree_element/object_tree_element.xml

@@ -2,8 +2,8 @@
 <templates xml:space="preserve">
   <t t-name="devtools.ObjectTreeElement" owl="1">
     <div class="m-0 p-0 text-nowrap w-100 object-line"
-      t-att-class="props.class + (props.object.hasChildren ? ' bg-feedback' : '')"
-      t-on-click.stop="() => this.store.toggleObjectTreeElementsDisplay(this.props.object)"
+      t-att-class="props.class"
+      t-on-click.stop="() => this.store.toggleObjectTreeElementsDisplay(this.props.object)" 
       t-on-contextmenu.prevent="openMenu" 
     >
       <div t-attf-style="padding-left: {{objectPadding}}rem">

tools/devtools/src/devtools_app/devtools_window/components_tab/tree_element/tree_element.js

@@ -1,9 +1,11 @@
 /** @odoo-module **/
 
-import { isElementInCenterViewport, minimizeKey, browserInstance } from "../../../../utils";
+import { isElementInCenterViewport, minimizeKey, IS_FIREFOX } from "../../../../utils";
 import { useStore } from "../../../store/store";
 import { HighlightText } from "./highlight_text/highlight_text";
 
+const browserInstance = IS_FIREFOX ? browser : chrome;
+
 const { Component, useRef, useState, useEffect, onMounted } = owl;
 
 export class TreeElement extends Component {

tools/devtools/src/devtools_app/devtools_window/devtools_window.xml

@@ -16,9 +16,9 @@
               <option t-att-value="frame"><t t-esc="frame"/></option>
             </t>
           </select>
-          <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 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 navbar-icon" title="Refresh extension" t-on-click.stop="() => this.store.refreshExtension()"></i>
+          <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="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 fa-repeat pointer-icon" title="Refresh extension" t-on-click.stop="() => this.store.refreshExtension()"></i>
         </div>
         <ComponentsTab t-if="store.page === 'ComponentsTab'"/>
         <ProfilerTab t-if="store.page === 'ProfilerTab'"/>

tools/devtools/src/devtools_app/devtools_window/profiler_tab/profiler_tab.xml

@@ -3,20 +3,20 @@
   <t t-name="devtools.ProfilerTab" owl="1">
     <div class="position-relative overflow-hidden d-flex flex-column h-100">
       <div class="panel-top d-flex align-items-center">
-        <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 profiler-icon p-2" t-on-click.stop="() => this.store.clearEventsConsole()" aria-hidden="true"></i>
-        <div class="icons-separator"/>
-        <select class="form-select form-select-sm custom-select pointer-icon border-0" t-on-change="selectDisplayMode">
+        <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="Clear events" class="fa fa-ban pointer-icon p-1 px-2" t-on-click.stop="() => this.store.clearEventsConsole()" aria-hidden="true"></i>
+        <div class="icons-separator mx-1"/>
+        <select class="form-select form-select-sm custom-select border-0" t-on-change="selectDisplayMode">
           <option t-att-selected="store.eventsTreeView" value="Tree">Tree view</option>
           <option t-att-selected="!store.eventsTreeView" value="List">Events log</option>
         </select>
-        <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>
+        <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>
         <div class="icons-separator"/>
-        <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 pointer-icon" t-att-checked="store.traceRenderings" t-on-input="() => this.store.toggleTracing()"/> Trace Renderings
+        <label class="mx-2 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
         </label>
-        <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 pointer-icon" t-att-checked="store.traceSubscriptions" t-on-input="() => this.store.toggleSubscriptionTracing()"/> Trace Subscriptions
+        <label class="mx-2 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
         </label>
         <!-- <EventSearchBar/> -->
       </div>

tools/devtools/src/devtools_app/store/store.js

@@ -1,7 +1,9 @@
 const { reactive, useState, toRaw } = owl;
-import { fuzzySearch, IS_FIREFOX, getActiveTabURL, browserInstance } from "../../utils";
+import { fuzzySearch, IS_FIREFOX, getActiveTabURL } from "../../utils";
 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
 export const store = reactive({
   devtoolsId: 0,
@@ -113,9 +115,6 @@ export const store = reactive({
     }
     keepEnvLit(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
@@ -147,7 +146,6 @@ export const store = reactive({
     }
     component.selected = true;
     highlightChildren(component);
-    this.highlightComponent(path);
     const details = await evalFunctionInWindow(
       "getComponentDetails",
       [component.path],
@@ -348,7 +346,7 @@ export const store = reactive({
 
   // Expand the children of the input object property and load it from page if necessary
   async toggleObjectTreeElementsDisplay(obj) {
-    if (!obj.hasChildren || window.getSelection().toString().length) {
+    if (!obj.hasChildren) {
       return;
     }
     // Since it is sometimes impossible (and always ineffective) to load all descendants of a property
@@ -941,9 +939,10 @@ function arraysEqual(arr1, arr2) {
 
 async function getTabURL() {
   if (IS_FIREFOX) {
-    // It is not possible to run getActiveTabURL inside the devtools when using firefox so we ask the background to execute it instead
-    const response = await browserInstance.runtime.sendMessage({ type: "getActiveTabURL" });
-    return response.result;
+    // This happens in firefox when the method is called inside devtools so we ask the background to execute it instead
+    browserInstance.runtime.sendMessage({ type: "getActiveTabURL" }).then((response) => {
+      return response.result;
+    });
   } else {
     return await getActiveTabURL();
   }