[FIX] component: fix issues with component internal template key

closes #298

src/component/directive.ts

@@ -243,21 +243,19 @@ QWeb.addDirective({
       ctx.addLine(`let key${keyID} = 'key' + ${key};`);
     }
     ctx.addLine(`let def${defID};`);
-    let templateID = key
-      ? `key${keyID}`
-      : ctx.inLoop
-      ? ctx.currentKey
-        ? `String(${ctx.currentKey} + '_k_' + i + '_c_' + ${componentID} )`
-        : `String(-${componentID} - i)`
-      : String(componentID);
-    if (ctx.allowMultipleRoots) {
-      templateID = `"_slot_${templateID}"`;
+
+    let locationExpr = `\`__${ctx.generateID()}__`;
+    for (let i = 0; i < ctx.loopNumber - 1; i++) {
+      locationExpr += `\${i${i + 1}}__`;
     }
-    if (key || ctx.inLoop) {
-      let id = ctx.generateID();
-      ctx.addLine(`let templateId${id} = ${templateID};`);
-      templateID = `templateId${id}`;
+    if (key || ctx.currentKey) {
+      const k = key ? `key${keyID}` : ctx.currentKey;
+      ctx.addLine(`let templateId${componentID} = ${locationExpr}\` + ${k};`);
+    } else {
+      locationExpr += ctx.loopNumber ? `\${i${ctx.loopNumber}}__\`` : "`";
+      ctx.addLine(`let templateId${componentID} = ${locationExpr};`);
     }
+    const templateId = `templateId${componentID}`;
 
     let ref = node.getAttribute("t-ref");
     let refExpr = "";
@@ -320,7 +318,7 @@ QWeb.addDirective({
         .map(function([eventName, mods, handlerName, extraArgs]) {
           let params = "owner";
           if (extraArgs) {
-            if (ctx.inLoop) {
+            if (ctx.loopNumber) {
               let argId = ctx.generateID();
               // we need to evaluate the arguments now, because the handler will
               // be set asynchronously later when the widget is ready, and the
@@ -352,7 +350,7 @@ QWeb.addDirective({
     }
 
     ctx.addLine(
-      `let w${componentID} = ${templateID} in parent.__owl__.cmap ? parent.__owl__.children[parent.__owl__.cmap[${templateID}]] : false;`
+      `let w${componentID} = ${templateId} in parent.__owl__.cmap ? parent.__owl__.children[parent.__owl__.cmap[${templateId}]] : false;`
     );
     if (ctx.parentNode) {
       ctx.addLine(`let _${dummyID}_index = c${ctx.parentNode}.length;`);
@@ -418,7 +416,7 @@ QWeb.addDirective({
       ctx.addLine(`utils.validateProps(W${componentID}, props${componentID})`);
     }
     ctx.addLine(`w${componentID} = new W${componentID}(parent, props${componentID});`);
-    ctx.addLine(`parent.__owl__.cmap[${templateID}] = w${componentID}.__owl__.id;`);
+    ctx.addLine(`parent.__owl__.cmap[${templateId}] = w${componentID}.__owl__.id;`);
 
     // SLOTS
     const varDefs: string[] = [];
@@ -470,7 +468,7 @@ QWeb.addDirective({
       registerCode = `utils.defineProxy(vn${ctx.rootNode}, pvnode);`;
     }
     ctx.addLine(
-      `def${defID} = def${defID}.then(vnode=>{if (w${componentID}.__owl__.isDestroyed){return}${createHook}let pvnode=h(vnode.sel, {key: ${templateID}, hook: {insert(vn) {let nvn=w${componentID}.__mount(vnode, pvnode.elm);pvnode.elm=nvn.elm;${refExpr}${transitionsInsertCode}},remove() {},destroy(vn) {${finalizeComponentCode}}}});${registerCode}w${componentID}.__owl__.pvnode = pvnode;});`
+      `def${defID} = def${defID}.then(vnode=>{if (w${componentID}.__owl__.isDestroyed){return}${createHook}let pvnode=h(vnode.sel, {key: ${templateId}, hook: {insert(vn) {let nvn=w${componentID}.__mount(vnode, pvnode.elm);pvnode.elm=nvn.elm;${refExpr}${transitionsInsertCode}},remove() {},destroy(vn) {${finalizeComponentCode}}}});${registerCode}w${componentID}.__owl__.pvnode = pvnode;});`
     );
 
     ctx.addElse();

src/qweb/base_directives.ts

@@ -275,7 +275,7 @@ QWeb.addDirective({
   priority: 10,
   atNodeEncounter({ node, qweb, ctx }): boolean {
     ctx.rootContext.shouldProtectContext = true;
-    ctx = ctx.subContext("inLoop", true);
+    ctx = ctx.subContext("loopNumber", ctx.loopNumber + 1);
     const elems = node.getAttribute("t-foreach")!;
     const name = node.getAttribute("t-as")!;
     let arrayID = ctx.generateID();
@@ -289,13 +289,14 @@ QWeb.addDirective({
     ctx.addLine(`_${valuesID} = Object.values(_${arrayID});`);
     ctx.closeIf();
     ctx.addLine(`var _length${keysID} = _${keysID}.length;`);
-    ctx.addLine(`for (let i = 0; i < _length${keysID}; i++) {`);
+    const loopVar = `i${ctx.loopNumber}`;
+    ctx.addLine(`for (let ${loopVar} = 0; ${loopVar} < _length${keysID}; ${loopVar}++) {`);
     ctx.indent();
-    ctx.addToScope(name + "_first", "i === 0");
-    ctx.addToScope(name + "_last", `i === _length${keysID} - 1`);
-    ctx.addToScope(name + "_index", "i");
-    ctx.addToScope(name, `_${keysID}[i]`);
-    ctx.addToScope(name + "_value", `_${valuesID}[i]`);
+    ctx.addToScope(name + "_first", `${loopVar} === 0`);
+    ctx.addToScope(name + "_last", `${loopVar} === _length${keysID} - 1`);
+    ctx.addToScope(name + "_index", loopVar);
+    ctx.addToScope(name, `_${keysID}[${loopVar}]`);
+    ctx.addToScope(name + "_value", `_${valuesID}[${loopVar}]`);
     const nodeCopy = <Element>node.cloneNode(true);
     let shouldWarn = nodeCopy.tagName !== "t" && !nodeCopy.hasAttribute("t-key");
     if (!shouldWarn && node.tagName === "t") {

src/qweb/compilation_context.ts

@@ -24,7 +24,7 @@ export class CompilationContext {
   shouldDefineResult: boolean = true;
   shouldProtectContext: boolean = false;
   shouldTrackScope: boolean = false;
-  inLoop: boolean = false;
+  loopNumber: number = 0;
   inPreTag: boolean = false;
   templateName: string;
   allowMultipleRoots: boolean = false;