[REF] *: reformat with prettier and printWidth=100

closes #214
odoo · Jun 28, 2019 · af7520d · af7520d
1 parent 0095bfa
commit af7520d
Show file tree

Hide file tree

Showing 28 changed files with 268 additions and 948 deletions.
diff --git a/package.json b/package.json
@@ -60,5 +60,8 @@
       "json",
       "node"
     ]
+  },
+  "prettier": {
+      "printWidth": 100
   }
 }
diff --git a/src/component.ts b/src/component.ts
@@ -437,10 +437,7 @@ export class Component<T extends Env, Props extends {}, State extends {}> {
     __owl__.renderPromise = null;
     const target = __owl__.vnode || document.createElement(vnode.sel!);
     if (this.__owl__.classObj) {
-      (<any>vnode).data.class = Object.assign(
-        (<any>vnode).data.class || {},
-        this.__owl__.classObj
-      );
+      (<any>vnode).data.class = Object.assign((<any>vnode).data.class || {}, this.__owl__.classObj);
     }
     __owl__.vnode = patch(target, vnode);
   }
@@ -471,17 +468,11 @@ export class Component<T extends Env, Props extends {}, State extends {}> {
       if (template) {
         this.template = template;
       } else {
-        while (
-          (template = p.name) &&
-          !(template in qweb.templates) &&
-          p !== Component
-        ) {
+        while ((template = p.name) && !(template in qweb.templates) && p !== Component) {
           p = p.__proto__;
         }
         if (p === Component) {
-          throw new Error(
-            `Could not find template for component "${this.constructor.name}"`
-          );
+          throw new Error(`Could not find template for component "${this.constructor.name}"`);
         } else {
           tmap[name] = template;
           this.template = template;
@@ -493,10 +484,7 @@ export class Component<T extends Env, Props extends {}, State extends {}> {
     return this.__render();
   }
 
-  async __render(
-    force: boolean = false,
-    patchQueue: any[] = []
-  ): Promise<VNode> {
+  async __render(force: boolean = false, patchQueue: any[] = []): Promise<VNode> {
     const __owl__ = this.__owl__;
     __owl__.renderId++;
     const promises: Promise<void>[] = [];
@@ -536,10 +524,7 @@ export class Component<T extends Env, Props extends {}, State extends {}> {
   __mount(vnode: VNode, elm: HTMLElement): VNode {
     const __owl__ = this.__owl__;
     if (__owl__.classObj) {
-      (<any>vnode).data.class = Object.assign(
-        (<any>vnode).data.class || {},
-        __owl__.classObj
-      );
+      (<any>vnode).data.class = Object.assign((<any>vnode).data.class || {}, __owl__.classObj);
     }
     __owl__.vnode = patch(elm, vnode);
     if (__owl__.parent!.__owl__.isMounted && !__owl__.isMounted) {
@@ -619,33 +604,23 @@ export class Component<T extends Env, Props extends {}, State extends {}> {
       // list of strings (prop names)
       for (let i = 0, l = propsDef.length; i < l; i++) {
         if (!(propsDef[i] in props)) {
-          throw new Error(
-            `Missing props '${propsDef[i]}' (component '${
-              this.constructor.name
-            }')`
-          );
+          throw new Error(`Missing props '${propsDef[i]}' (component '${this.constructor.name}')`);
         }
       }
     } else if (propsDef) {
       // propsDef is an object now
       for (let propName in propsDef) {
         if (!(propName in props)) {
           if (propsDef[propName] && !propsDef[propName].optional) {
-            throw new Error(
-              `Missing props '${propName}' (component '${
-                this.constructor.name
-              }')`
-            );
+            throw new Error(`Missing props '${propName}' (component '${this.constructor.name}')`);
           } else {
             break;
           }
         }
         let isValid = isValidProp(props[propName], propsDef[propName]);
         if (!isValid) {
           throw new Error(
-            `Props '${propName}' of invalid type in component '${
-              this.constructor.name
-            }'`
+            `Props '${propName}' of invalid type in component '${this.constructor.name}'`
           );
         }
       }

diff --git a/src/index.ts b/src/index.ts
@@ -32,7 +32,7 @@ Object.defineProperty(__info__, "mode", {
         `Owl is running in 'dev' mode.  This is not suitable for production use. See ${url} for more information.`
       );
     } else {
-        console.log(`Owl is now running in 'prod' mode.`)
+      console.log(`Owl is now running in 'prod' mode.`);
     }
   }
 });

diff --git a/src/observer.ts b/src/observer.ts
@@ -21,15 +21,7 @@
 
 // we define here a new modified Array prototype, which basically override all
 // Array methods that change some state to be able to track their changes
-const methodsToPatch = [
-  "push",
-  "pop",
-  "shift",
-  "unshift",
-  "splice",
-  "sort",
-  "reverse"
-];
+const methodsToPatch = ["push", "pop", "shift", "unshift", "splice", "sort", "reverse"];
 const methodLen = methodsToPatch.length;
 
 const ArrayProto = Array.prototype;
@@ -78,18 +70,14 @@ export class Observer {
 
   static set(target: any, key: number | string, value: any) {
     if (!target.__owl__) {
-      throw Error(
-        "`Observer.set()` can only be called with observed Objects or Arrays"
-      );
+      throw Error("`Observer.set()` can only be called with observed Objects or Arrays");
     }
     target.__owl__.observer.set(target, key, value);
   }
 
   static delete(target: any, key: number | string) {
     if (!target.__owl__) {
-      throw Error(
-        "`Observer.delete()` can only be called with observed Objects"
-      );
+      throw Error("`Observer.delete()` can only be called with observed Objects");
     }
     target.__owl__.observer.delete(target, key);
   }
@@ -127,8 +115,7 @@ export class Observer {
 
   set(target: any, key: number | string, value: any) {
     let alreadyDefined =
-      key in target &&
-      Object.getOwnPropertyDescriptor(target, key)!.configurable === false;
+      key in target && Object.getOwnPropertyDescriptor(target, key)!.configurable === false;
     if (alreadyDefined) {
       target[key] = value;
     } else {
@@ -172,11 +159,7 @@ export class Observer {
     }
   }
 
-  _addProp<T extends { __owl__?: any }>(
-    obj: T,
-    key: string | number,
-    value: any
-  ) {
+  _addProp<T extends { __owl__?: any }>(obj: T, key: string | number, value: any) {
     var self = this;
     Object.defineProperty(obj, key, {
       configurable: true,

diff --git a/src/qweb_core.ts b/src/qweb_core.ts
@@ -59,14 +59,7 @@ export interface Directive {
 // Const/global stuff/helpers
 //------------------------------------------------------------------------------
 
-const DISABLED_TAGS = [
-  "input",
-  "textarea",
-  "button",
-  "select",
-  "option",
-  "optgroup"
-];
+const DISABLED_TAGS = ["input", "textarea", "button", "select", "option", "optgroup"];
 
 const lineBreakRE = /[\r\n]/;
 const whitespaceRE = /\s+/g;
@@ -97,10 +90,10 @@ export const UTILS: Utils = {
   h: h,
   toObj(expr) {
     if (typeof expr === "string") {
-        expr = expr.trim();
-        if (!expr) {
-            return {};
-        }
+      expr = expr.trim();
+      if (!expr) {
+        return {};
+      }
       let words = expr.split(/\s+/);
       let result = {};
       for (let i = 0; i < words.length; i++) {
@@ -245,9 +238,7 @@ export class QWeb extends EventBus {
             return a + b;
           }) > 1
         ) {
-          throw new Error(
-            "Only one conditional branching directive is allowed per node"
-          );
+          throw new Error("Only one conditional branching directive is allowed per node");
         }
         // All text nodes between branch nodes are removed
         let textNode;
@@ -311,28 +302,20 @@ export class QWeb extends EventBus {
     }
     let template;
     try {
-      template = new Function(
-        "context",
-        "extra",
-        ctx.code.join("\n")
-      ) as CompiledTemplate;
+      template = new Function("context", "extra", ctx.code.join("\n")) as CompiledTemplate;
     } catch (e) {
       const templateName = ctx.templateName.replace(/`/g, "'");
       console.groupCollapsed(`Invalid Code generated by ${templateName}`);
       console.warn(ctx.code.join("\n"));
       console.groupEnd();
       throw new Error(
-        `Invalid generated code while compiling template '${templateName}': ${
-          e.message
-        }`
+        `Invalid generated code while compiling template '${templateName}': ${e.message}`
       );
     }
     if (isDebug) {
       const tpl = this.templates[name];
       if (tpl) {
-        const msg = `Template: ${
-          tpl.elem.outerHTML
-        }\nCompiled code:\n${template.toString()}`;
+        const msg = `Template: ${tpl.elem.outerHTML}\nCompiled code:\n${template.toString()}`;
         console.log(msg);
       }
     }
@@ -481,11 +464,7 @@ export class QWeb extends EventBus {
     }
   }
 
-  _compileGenericNode(
-    node: ChildNode,
-    ctx: Context,
-    withHandlers: boolean = true
-  ): number {
+  _compileGenericNode(node: ChildNode, ctx: Context, withHandlers: boolean = true): number {
     // nodeType 1 is generic tag
     if (node.nodeType !== 1) {
       throw new Error("unsupported node type");
@@ -509,10 +488,7 @@ export class QWeb extends EventBus {
       if (key === "disabled" && DISABLED_TAGS.indexOf(node.nodeName) > -1) {
         isProp = true;
       }
-      if (
-        (key === "readonly" && node.nodeName === "input") ||
-        node.nodeName === "textarea"
-      ) {
+      if ((key === "readonly" && node.nodeName === "input") || node.nodeName === "textarea") {
         isProp = true;
       }
       if (isProp) {
@@ -526,10 +502,7 @@ export class QWeb extends EventBus {
       const value = attributes[i].textContent!;
 
       // regular attributes
-      if (
-        !name.startsWith("t-") &&
-        !(<Element>node).getAttribute("t-attf-" + name)
-      ) {
+      if (!name.startsWith("t-") && !(<Element>node).getAttribute("t-attf-" + name)) {
         const attID = ctx.generateID();
         if (name === "class") {
           let classDef = value
@@ -577,9 +550,7 @@ export class QWeb extends EventBus {
             const attValueID = ctx.generateID();
             ctx.addLine(`var _${attValueID} = ${formattedValue};`);
             formattedValue = `'${attValue}' + (_${attValueID} ? ' ' + _${attValueID} : '')`;
-            const attrIndex = attrs.findIndex(att =>
-              att.startsWith(attName + ":")
-            );
+            const attrIndex = attrs.findIndex(att => att.startsWith(attName + ":"));
             attrs.splice(attrIndex, 1);
           }
           ctx.addLine(`var _${attID} = ${formattedValue};`);
@@ -645,9 +616,7 @@ export class QWeb extends EventBus {
       ctx.addLine(`}`);
       ctx.closeIf();
     }
-    ctx.addLine(
-      `var vn${nodeID} = h('${node.nodeName}', p${nodeID}, c${nodeID});`
-    );
+    ctx.addLine(`var vn${nodeID} = h('${node.nodeName}', p${nodeID}, c${nodeID});`);
     if (ctx.parentNode) {
       ctx.addLine(`c${ctx.parentNode}.push(vn${nodeID});`);
     }
@@ -776,10 +745,7 @@ export class Context {
       return `(${this.formatExpression(s.slice(2, -2))})`;
     }
 
-    let r = s.replace(
-      /\{\{.*?\}\}/g,
-      s => "${" + this.formatExpression(s.slice(2, -2)) + "}"
-    );
+    let r = s.replace(/\{\{.*?\}\}/g, s => "${" + this.formatExpression(s.slice(2, -2)) + "}");
     return "`" + r + "`";
   }
 }
diff --git a/src/qweb_directives.ts b/src/qweb_directives.ts
@@ -60,9 +60,7 @@ function compileValueNode(value: any, node: Element, qweb: QWeb, ctx: Context) {
     ctx.addLine(`var frag${fragID} = this.utils.getFragment(${exprID})`);
     let tempNodeID = ctx.generateID();
     ctx.addLine(`var p${tempNodeID} = {hook: {`);
-    ctx.addLine(
-      `  insert: n => n.elm.parentNode.replaceChild(frag${fragID}, n.elm),`
-    );
+    ctx.addLine(`  insert: n => n.elm.parentNode.replaceChild(frag${fragID}, n.elm),`);
     ctx.addLine(`}};`);
     ctx.addLine(`var vn${tempNodeID} = h('div', p${tempNodeID})`);
     ctx.addLine(`c${ctx.parentNode}.push(vn${tempNodeID});`);
@@ -116,9 +114,7 @@ QWeb.addDirective({
     if (value) {
       const formattedValue = ctx.formatExpression(value);
       if (ctx.variables.hasOwnProperty(variable)) {
-        ctx.addLine(
-          `${(<QWebExprVar>ctx.variables[variable]).id} = ${formattedValue}`
-        );
+        ctx.addLine(`${(<QWebExprVar>ctx.variables[variable]).id} = ${formattedValue}`);
       } else {
         const varName = `_${ctx.generateID()}`;
         ctx.addLine(`var ${varName} = ${formattedValue};`);
@@ -220,9 +216,7 @@ QWeb.addDirective({
     }
 
     // compile sub template
-    const subCtx = ctx
-      .subContext("caller", nodeCopy)
-      .subContext("variables", Object.create(vars));
+    const subCtx = ctx.subContext("caller", nodeCopy).subContext("variables", Object.create(vars));
 
     qweb._compileNode(nodeTemplate.elem, subCtx);
 
@@ -250,9 +244,7 @@ QWeb.addDirective({
     const name = node.getAttribute("t-as")!;
     let arrayID = ctx.generateID();
     ctx.addLine(`var _${arrayID} = ${ctx.formatExpression(elems)};`);
-    ctx.addLine(
-      `if (!_${arrayID}) { throw new Error('QWeb error: Invalid loop expression')}`
-    );
+    ctx.addLine(`if (!_${arrayID}) { throw new Error('QWeb error: Invalid loop expression')}`);
     let keysID = ctx.generateID();
     let valuesID = ctx.generateID();
     ctx.addLine(`var _${keysID} = _${valuesID} = _${arrayID};`);
@@ -269,8 +261,7 @@ QWeb.addDirective({
     ctx.addLine(`context.${name} = _${keysID}[i];`);
     ctx.addLine(`context.${name}_value = _${valuesID}[i];`);
     const nodeCopy = <Element>node.cloneNode(true);
-    let shouldWarn =
-      nodeCopy.tagName !== "t" && !nodeCopy.hasAttribute("t-key");
+    let shouldWarn = nodeCopy.tagName !== "t" && !nodeCopy.hasAttribute("t-key");
     if (!shouldWarn && node.tagName === "t") {
       if (node.hasAttribute("t-component") && !node.hasAttribute("t-key")) {
         shouldWarn = true;