mirror of
https://github.com/odoo/owl.git
synced 2025-10-06 19:59:41 +07:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9edd31f755 |
+26
-72
@@ -4539,7 +4539,7 @@ class CodeGenerator {
|
||||
const isNewBlock = !block || forceNewBlock;
|
||||
let codeIdx = this.target.code.length;
|
||||
if (isNewBlock) {
|
||||
const n = ast.content.filter((c) => !c.hasNoRepresentation).length;
|
||||
const n = ast.content.filter((c) => c.type !== 6 /* TSet */).length;
|
||||
let result = null;
|
||||
if (n <= 1) {
|
||||
for (let child of ast.content) {
|
||||
@@ -4553,15 +4553,15 @@ class CodeGenerator {
|
||||
let index = 0;
|
||||
for (let i = 0, l = ast.content.length; i < l; i++) {
|
||||
const child = ast.content[i];
|
||||
const forceNewBlock = !child.hasNoRepresentation;
|
||||
const isTSet = child.type === 6 /* TSet */;
|
||||
const subCtx = createContext(ctx, {
|
||||
block,
|
||||
index,
|
||||
forceNewBlock,
|
||||
forceNewBlock: !isTSet,
|
||||
isLast: ctx.isLast && i === l - 1,
|
||||
});
|
||||
this.compileAST(child, subCtx);
|
||||
if (forceNewBlock) {
|
||||
if (!isTSet) {
|
||||
index++;
|
||||
}
|
||||
}
|
||||
@@ -4979,9 +4979,9 @@ function parseNode(node, ctx) {
|
||||
parseTCallBlock(node) ||
|
||||
parseTTranslation(node, ctx) ||
|
||||
parseTTranslationContext(node, ctx) ||
|
||||
parseTKey(node, ctx) ||
|
||||
parseTEscNode(node, ctx) ||
|
||||
parseTOutNode(node, ctx) ||
|
||||
parseTKey(node, ctx) ||
|
||||
parseTSlot(node, ctx) ||
|
||||
parseComponent(node, ctx) ||
|
||||
parseDOMNode(node, ctx) ||
|
||||
@@ -5049,29 +5049,19 @@ function parseTCustom(node, ctx) {
|
||||
function parseTDebugLog(node, ctx) {
|
||||
if (node.hasAttribute("t-debug")) {
|
||||
node.removeAttribute("t-debug");
|
||||
const content = parseNode(node, ctx);
|
||||
const ast = {
|
||||
return {
|
||||
type: 12 /* TDebug */,
|
||||
content,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
if (content === null || content === void 0 ? void 0 : content.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
if (node.hasAttribute("t-log")) {
|
||||
const expr = node.getAttribute("t-log");
|
||||
node.removeAttribute("t-log");
|
||||
const content = parseNode(node, ctx);
|
||||
const ast = {
|
||||
return {
|
||||
type: 13 /* TLog */,
|
||||
expr,
|
||||
content,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
if (content === null || content === void 0 ? void 0 : content.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -5301,19 +5291,11 @@ function parseTKey(node, ctx) {
|
||||
}
|
||||
const key = node.getAttribute("t-key");
|
||||
node.removeAttribute("t-key");
|
||||
const content = parseNode(node, ctx);
|
||||
if (!content) {
|
||||
const body = parseNode(node, ctx);
|
||||
if (!body) {
|
||||
return null;
|
||||
}
|
||||
const ast = {
|
||||
type: 10 /* TKey */,
|
||||
expr: key,
|
||||
content,
|
||||
};
|
||||
if (content.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
return { type: 10 /* TKey */, expr: key, content: body };
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
// t-call
|
||||
@@ -5422,7 +5404,7 @@ function parseTSetNode(node, ctx) {
|
||||
if (node.textContent !== node.innerHTML) {
|
||||
body = parseChildren(node, ctx);
|
||||
}
|
||||
return { type: 6 /* TSet */, name, value, defaultValue, body, hasNoRepresentation: true };
|
||||
return { type: 6 /* TSet */, name, value, defaultValue, body };
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
// Components
|
||||
@@ -5601,51 +5583,30 @@ function parseTSlot(node, ctx) {
|
||||
// -----------------------------------------------------------------------------
|
||||
// Translation
|
||||
// -----------------------------------------------------------------------------
|
||||
function wrapInTTranslationAST(r) {
|
||||
const ast = { type: 16 /* TTranslation */, content: r };
|
||||
if (r === null || r === void 0 ? void 0 : r.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
function parseTTranslation(node, ctx) {
|
||||
if (node.getAttribute("t-translation") !== "off") {
|
||||
return null;
|
||||
}
|
||||
node.removeAttribute("t-translation");
|
||||
const result = parseNode(node, ctx);
|
||||
if ((result === null || result === void 0 ? void 0 : result.type) === 3 /* Multi */) {
|
||||
const children = result.content.map(wrapInTTranslationAST);
|
||||
return makeASTMulti(children);
|
||||
}
|
||||
return wrapInTTranslationAST(result);
|
||||
return {
|
||||
type: 16 /* TTranslation */,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
// Translation Context
|
||||
// -----------------------------------------------------------------------------
|
||||
function wrapInTTranslationContextAST(r, translationCtx) {
|
||||
const ast = {
|
||||
type: 17 /* TTranslationContext */,
|
||||
content: r,
|
||||
translationCtx,
|
||||
};
|
||||
if (r === null || r === void 0 ? void 0 : r.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
function parseTTranslationContext(node, ctx) {
|
||||
const translationCtx = node.getAttribute("t-translation-context");
|
||||
if (!translationCtx) {
|
||||
return null;
|
||||
}
|
||||
node.removeAttribute("t-translation-context");
|
||||
const result = parseNode(node, ctx);
|
||||
if ((result === null || result === void 0 ? void 0 : result.type) === 3 /* Multi */) {
|
||||
const children = result.content.map((c) => wrapInTTranslationContextAST(c, translationCtx));
|
||||
return makeASTMulti(children);
|
||||
}
|
||||
return wrapInTTranslationContextAST(result, translationCtx);
|
||||
return {
|
||||
type: 17 /* TTranslationContext */,
|
||||
content: parseNode(node, ctx),
|
||||
translationCtx,
|
||||
};
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
// Portal
|
||||
@@ -5690,13 +5651,6 @@ function parseChildren(node, ctx) {
|
||||
}
|
||||
return children;
|
||||
}
|
||||
function makeASTMulti(children) {
|
||||
const ast = { type: 3 /* Multi */, content: children };
|
||||
if (children.every((c) => c.hasNoRepresentation)) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
/**
|
||||
* Parse all the child nodes of a given node and return an ast if possible.
|
||||
* In the case there are multiple children, they are wrapped in a astmulti.
|
||||
@@ -5709,7 +5663,7 @@ function parseChildNodes(node, ctx) {
|
||||
case 1:
|
||||
return children[0];
|
||||
default:
|
||||
return makeASTMulti(children);
|
||||
return { type: 3 /* Multi */, content: children };
|
||||
}
|
||||
}
|
||||
/**
|
||||
@@ -5813,7 +5767,7 @@ function compile(template, options = {
|
||||
}
|
||||
|
||||
// do not modify manually. This file is generated by the release script.
|
||||
const version = "2.8.1";
|
||||
const version = "2.8.0";
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Scheduler
|
||||
@@ -6284,6 +6238,6 @@ TemplateSet.prototype._compileTemplate = function _compileTemplate(name, templat
|
||||
export { App, Component, EventBus, OwlError, __info__, batched, blockDom, htmlEscape, 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 = '2025-09-23T07:17:45.055Z';
|
||||
__info__.hash = '5211116';
|
||||
__info__.date = '2025-06-30T12:46:06.424Z';
|
||||
__info__.hash = 'b620502';
|
||||
__info__.url = 'https://github.com/odoo/owl';
|
||||
|
||||
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@odoo/owl",
|
||||
"version": "2.8.1",
|
||||
"version": "2.8.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@odoo/owl",
|
||||
"version": "2.8.1",
|
||||
"version": "2.8.0",
|
||||
"description": "Odoo Web Library (OWL)",
|
||||
"main": "dist/owl.cjs.js",
|
||||
"module": "dist/owl.es.js",
|
||||
|
||||
@@ -995,7 +995,7 @@ export class CodeGenerator {
|
||||
const isNewBlock = !block || forceNewBlock;
|
||||
let codeIdx = this.target.code.length;
|
||||
if (isNewBlock) {
|
||||
const n = ast.content.filter((c) => !c.hasNoRepresentation).length;
|
||||
const n = ast.content.filter((c) => c.type !== ASTType.TSet).length;
|
||||
let result: string | null = null;
|
||||
if (n <= 1) {
|
||||
for (let child of ast.content) {
|
||||
@@ -1009,15 +1009,15 @@ export class CodeGenerator {
|
||||
let index = 0;
|
||||
for (let i = 0, l = ast.content.length; i < l; i++) {
|
||||
const child = ast.content[i];
|
||||
const forceNewBlock = !child.hasNoRepresentation;
|
||||
const isTSet = child.type === ASTType.TSet;
|
||||
const subCtx = createContext(ctx, {
|
||||
block,
|
||||
index,
|
||||
forceNewBlock,
|
||||
forceNewBlock: !isTSet,
|
||||
isLast: ctx.isLast && i === l - 1,
|
||||
});
|
||||
this.compileAST(child, subCtx);
|
||||
if (forceNewBlock) {
|
||||
if (!isTSet) {
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
+38
-93
@@ -31,17 +31,12 @@ export const enum ASTType {
|
||||
TPortal,
|
||||
}
|
||||
|
||||
export interface BaseAST {
|
||||
type: ASTType;
|
||||
hasNoRepresentation?: true;
|
||||
}
|
||||
|
||||
export interface ASTText extends BaseAST {
|
||||
export interface ASTText {
|
||||
type: ASTType.Text;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface ASTComment extends BaseAST {
|
||||
export interface ASTComment {
|
||||
type: ASTType.Comment;
|
||||
value: string;
|
||||
}
|
||||
@@ -57,7 +52,7 @@ interface TModelInfo {
|
||||
specialInitTargetAttr: string | null;
|
||||
}
|
||||
|
||||
export interface ASTDomNode extends BaseAST {
|
||||
export interface ASTDomNode {
|
||||
type: ASTType.DomNode;
|
||||
tag: string;
|
||||
content: AST[];
|
||||
@@ -70,24 +65,24 @@ export interface ASTDomNode extends BaseAST {
|
||||
ns: string | null;
|
||||
}
|
||||
|
||||
export interface ASTMulti extends BaseAST {
|
||||
export interface ASTMulti {
|
||||
type: ASTType.Multi;
|
||||
content: AST[];
|
||||
}
|
||||
|
||||
export interface ASTTEsc extends BaseAST {
|
||||
export interface ASTTEsc {
|
||||
type: ASTType.TEsc;
|
||||
expr: string;
|
||||
defaultValue: string;
|
||||
}
|
||||
|
||||
export interface ASTTOut extends BaseAST {
|
||||
export interface ASTTOut {
|
||||
type: ASTType.TOut;
|
||||
expr: string;
|
||||
body: AST[] | null;
|
||||
}
|
||||
|
||||
export interface ASTTif extends BaseAST {
|
||||
export interface ASTTif {
|
||||
type: ASTType.TIf;
|
||||
condition: string;
|
||||
content: AST;
|
||||
@@ -95,16 +90,15 @@ export interface ASTTif extends BaseAST {
|
||||
tElse: AST | null;
|
||||
}
|
||||
|
||||
export interface ASTTSet extends BaseAST {
|
||||
export interface ASTTSet {
|
||||
type: ASTType.TSet;
|
||||
name: string;
|
||||
value: string | null; // value defined in attribute
|
||||
defaultValue: string | null; // value defined in body, if text
|
||||
body: AST[] | null; // content of body if not text
|
||||
hasNoRepresentation: true;
|
||||
}
|
||||
|
||||
export interface ASTTForEach extends BaseAST {
|
||||
export interface ASTTForEach {
|
||||
type: ASTType.TForEach;
|
||||
collection: string;
|
||||
elem: string;
|
||||
@@ -117,13 +111,13 @@ export interface ASTTForEach extends BaseAST {
|
||||
key: string | null;
|
||||
}
|
||||
|
||||
export interface ASTTKey extends BaseAST {
|
||||
export interface ASTTKey {
|
||||
type: ASTType.TKey;
|
||||
expr: string;
|
||||
content: AST;
|
||||
}
|
||||
|
||||
export interface ASTTCall extends BaseAST {
|
||||
export interface ASTTCall {
|
||||
type: ASTType.TCall;
|
||||
name: string;
|
||||
body: AST[] | null;
|
||||
@@ -138,7 +132,7 @@ interface SlotDefinition {
|
||||
attrsTranslationCtx: Attrs | null;
|
||||
}
|
||||
|
||||
export interface ASTComponent extends BaseAST {
|
||||
export interface ASTComponent {
|
||||
type: ASTType.TComponent;
|
||||
name: string;
|
||||
isDynamic: boolean;
|
||||
@@ -149,7 +143,7 @@ export interface ASTComponent extends BaseAST {
|
||||
slots: { [name: string]: SlotDefinition } | null;
|
||||
}
|
||||
|
||||
export interface ASTSlot extends BaseAST {
|
||||
export interface ASTSlot {
|
||||
type: ASTType.TSlot;
|
||||
name: string;
|
||||
attrs: Attrs | null;
|
||||
@@ -158,34 +152,34 @@ export interface ASTSlot extends BaseAST {
|
||||
defaultContent: AST | null;
|
||||
}
|
||||
|
||||
export interface ASTTCallBlock extends BaseAST {
|
||||
export interface ASTTCallBlock {
|
||||
type: ASTType.TCallBlock;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface ASTDebug extends BaseAST {
|
||||
export interface ASTDebug {
|
||||
type: ASTType.TDebug;
|
||||
content: AST | null;
|
||||
}
|
||||
|
||||
export interface ASTLog extends BaseAST {
|
||||
export interface ASTLog {
|
||||
type: ASTType.TLog;
|
||||
expr: string;
|
||||
content: AST | null;
|
||||
}
|
||||
|
||||
export interface ASTTranslation extends BaseAST {
|
||||
export interface ASTTranslation {
|
||||
type: ASTType.TTranslation;
|
||||
content: AST | null;
|
||||
}
|
||||
|
||||
export interface ASTTranslationContext extends BaseAST {
|
||||
export interface ASTTranslationContext {
|
||||
type: ASTType.TTranslationContext;
|
||||
content: AST | null;
|
||||
translationCtx: string;
|
||||
}
|
||||
|
||||
export interface ASTTPortal extends BaseAST {
|
||||
export interface ASTTPortal {
|
||||
type: ASTType.TPortal;
|
||||
target: string;
|
||||
content: AST;
|
||||
@@ -261,9 +255,9 @@ function parseNode(node: Node, ctx: ParsingContext): AST | null {
|
||||
parseTCallBlock(node, ctx) ||
|
||||
parseTTranslation(node, ctx) ||
|
||||
parseTTranslationContext(node, ctx) ||
|
||||
parseTKey(node, ctx) ||
|
||||
parseTEscNode(node, ctx) ||
|
||||
parseTOutNode(node, ctx) ||
|
||||
parseTKey(node, ctx) ||
|
||||
parseTSlot(node, ctx) ||
|
||||
parseComponent(node, ctx) ||
|
||||
parseDOMNode(node, ctx) ||
|
||||
@@ -340,30 +334,20 @@ function parseTCustom(node: Element, ctx: ParsingContext): AST | null {
|
||||
function parseTDebugLog(node: Element, ctx: ParsingContext): AST | null {
|
||||
if (node.hasAttribute("t-debug")) {
|
||||
node.removeAttribute("t-debug");
|
||||
const content = parseNode(node, ctx);
|
||||
const ast: ASTDebug = {
|
||||
return {
|
||||
type: ASTType.TDebug,
|
||||
content,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
if (content?.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
|
||||
if (node.hasAttribute("t-log")) {
|
||||
const expr = node.getAttribute("t-log")!;
|
||||
node.removeAttribute("t-log");
|
||||
const content = parseNode(node, ctx);
|
||||
const ast: ASTLog = {
|
||||
return {
|
||||
type: ASTType.TLog,
|
||||
expr,
|
||||
content,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
if (content?.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -614,19 +598,11 @@ function parseTKey(node: Element, ctx: ParsingContext): AST | null {
|
||||
}
|
||||
const key = node.getAttribute("t-key")!;
|
||||
node.removeAttribute("t-key");
|
||||
const content = parseNode(node, ctx);
|
||||
if (!content) {
|
||||
const body = parseNode(node, ctx);
|
||||
if (!body) {
|
||||
return null;
|
||||
}
|
||||
const ast: ASTTKey = {
|
||||
type: ASTType.TKey,
|
||||
expr: key,
|
||||
content,
|
||||
};
|
||||
if (content.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
return { type: ASTType.TKey, expr: key, content: body };
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -748,7 +724,7 @@ function parseTSetNode(node: Element, ctx: ParsingContext): AST | null {
|
||||
if (node.textContent !== node.innerHTML) {
|
||||
body = parseChildren(node, ctx);
|
||||
}
|
||||
return { type: ASTType.TSet, name, value, defaultValue, body, hasNoRepresentation: true };
|
||||
return { type: ASTType.TSet, name, value, defaultValue, body };
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -940,55 +916,32 @@ function parseTSlot(node: Element, ctx: ParsingContext): AST | null {
|
||||
// Translation
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
function wrapInTTranslationAST(r: AST | null) {
|
||||
const ast: ASTTranslation = { type: ASTType.TTranslation, content: r };
|
||||
if (r?.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
|
||||
function parseTTranslation(node: Element, ctx: ParsingContext): AST | null {
|
||||
if (node.getAttribute("t-translation") !== "off") {
|
||||
return null;
|
||||
}
|
||||
node.removeAttribute("t-translation");
|
||||
const result = parseNode(node, ctx);
|
||||
if (result?.type === ASTType.Multi) {
|
||||
const children = result.content.map(wrapInTTranslationAST);
|
||||
return makeASTMulti(children);
|
||||
}
|
||||
return wrapInTTranslationAST(result);
|
||||
return {
|
||||
type: ASTType.TTranslation,
|
||||
content: parseNode(node, ctx),
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Translation Context
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
function wrapInTTranslationContextAST(r: AST | null, translationCtx: string) {
|
||||
const ast: ASTTranslationContext = {
|
||||
type: ASTType.TTranslationContext,
|
||||
content: r,
|
||||
translationCtx,
|
||||
};
|
||||
if (r?.hasNoRepresentation) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
|
||||
function parseTTranslationContext(node: Element, ctx: ParsingContext): AST | null {
|
||||
const translationCtx = node.getAttribute("t-translation-context");
|
||||
if (!translationCtx) {
|
||||
return null;
|
||||
}
|
||||
node.removeAttribute("t-translation-context");
|
||||
const result = parseNode(node, ctx);
|
||||
if (result?.type === ASTType.Multi) {
|
||||
const children = result.content.map((c) => wrapInTTranslationContextAST(c, translationCtx));
|
||||
return makeASTMulti(children);
|
||||
}
|
||||
return wrapInTTranslationContextAST(result, translationCtx);
|
||||
return {
|
||||
type: ASTType.TTranslationContext,
|
||||
content: parseNode(node, ctx),
|
||||
translationCtx,
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -1037,14 +990,6 @@ function parseChildren(node: Element, ctx: ParsingContext): AST[] {
|
||||
return children;
|
||||
}
|
||||
|
||||
function makeASTMulti(children: AST[]) {
|
||||
const ast: ASTMulti = { type: ASTType.Multi, content: children };
|
||||
if (children.every((c) => c.hasNoRepresentation)) {
|
||||
ast.hasNoRepresentation = true;
|
||||
}
|
||||
return ast;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse all the child nodes of a given node and return an ast if possible.
|
||||
* In the case there are multiple children, they are wrapped in a astmulti.
|
||||
@@ -1057,7 +1002,7 @@ function parseChildNodes(node: Element, ctx: ParsingContext): AST | null {
|
||||
case 1:
|
||||
return children[0];
|
||||
default:
|
||||
return makeASTMulti(children);
|
||||
return { type: ASTType.Multi, content: children };
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { OwlError } from "../common/owl_error";
|
||||
import { ComponentNode, getCurrent } from "./component_node";
|
||||
export type Callback = () => void;
|
||||
|
||||
/**
|
||||
@@ -81,10 +82,52 @@ export function validateTarget(target: HTMLElement | ShadowRoot) {
|
||||
}
|
||||
|
||||
export class EventBus extends EventTarget {
|
||||
constructor(events?: string[]) {
|
||||
if (events) {
|
||||
let node: ComponentNode | null = null;
|
||||
try {
|
||||
node = getCurrent();
|
||||
} catch {}
|
||||
if (node?.app?.dev) {
|
||||
return new DebugEventBus(events);
|
||||
}
|
||||
}
|
||||
super();
|
||||
}
|
||||
trigger(name: string, payload?: any) {
|
||||
this.dispatchEvent(new CustomEvent(name, { detail: payload }));
|
||||
}
|
||||
}
|
||||
class DebugEventBus extends EventBus {
|
||||
private events: Set<string>;
|
||||
constructor(events: string[]) {
|
||||
super();
|
||||
this.events = new Set(events);
|
||||
}
|
||||
addEventListener(
|
||||
type: string,
|
||||
listener: EventListenerOrEventListenerObject | null,
|
||||
options?: boolean | AddEventListenerOptions
|
||||
): void {
|
||||
if (!this.events.has(type)) {
|
||||
throw new OwlError(`EventBus: subscribing to unknown event '${type}'`);
|
||||
}
|
||||
super.addEventListener(type, listener, options);
|
||||
}
|
||||
trigger(name: string, payload?: any) {
|
||||
if (!this.events.has(name)) {
|
||||
throw new OwlError(`EventBus: triggering unknown event '${name}'`);
|
||||
}
|
||||
super.trigger(name, payload);
|
||||
}
|
||||
|
||||
dispatchEvent(event: Event): boolean {
|
||||
if (!this.events.has(event.type)) {
|
||||
throw new OwlError(`EventBus: dispatching unknown event '${event.type}'`);
|
||||
}
|
||||
return super.dispatchEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
export function whenReady(fn?: any): Promise<void> {
|
||||
return new Promise(function (resolve) {
|
||||
|
||||
+1
-1
@@ -1,2 +1,2 @@
|
||||
// do not modify manually. This file is generated by the release script.
|
||||
export const version = "2.8.1";
|
||||
export const version = "2.8.0";
|
||||
|
||||
@@ -49,27 +49,6 @@ exports[`debugging t-debug on sub template 2`] = `
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`debugging t-debug: interaction with t-set 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||
let { isBoundary, withDefault, setContextValue } = helpers;
|
||||
|
||||
let block1 = createBlock(\`<span><block-text-0/></span>\`);
|
||||
|
||||
return function template(ctx, node, key = \\"\\") {
|
||||
ctx = Object.create(ctx);
|
||||
ctx[isBoundary] = 1
|
||||
debugger;
|
||||
setContextValue(ctx, \\"foo\\", 42);
|
||||
debugger;
|
||||
setContextValue(ctx, \\"bar\\", 49);
|
||||
let txt1 = ctx['foo']+ctx['bar'];
|
||||
return block1([txt1]);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`debugging t-log 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
@@ -87,24 +66,3 @@ exports[`debugging t-log 1`] = `
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`debugging t-log: interaction with t-set 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||
let { isBoundary, withDefault, setContextValue } = helpers;
|
||||
|
||||
let block1 = createBlock(\`<span><block-text-0/></span>\`);
|
||||
|
||||
return function template(ctx, node, key = \\"\\") {
|
||||
ctx = Object.create(ctx);
|
||||
ctx[isBoundary] = 1
|
||||
console.log(ctx['foo']);
|
||||
setContextValue(ctx, \\"foo\\", 42);
|
||||
console.log(ctx['bar']);
|
||||
setContextValue(ctx, \\"bar\\", 49);
|
||||
let txt1 = ctx['foo']+ctx['bar'];
|
||||
return block1([txt1]);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
@@ -103,18 +103,3 @@ exports[`t-key t-key on sub dom node pushes a child block in its parent 2`] = `
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`t-key t-key: interaction with t-esc 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||
|
||||
let block1 = createBlock(\`<p><block-text-0/></p>\`);
|
||||
|
||||
return function template(ctx, node, key = \\"\\") {
|
||||
const tKey_1 = ctx['key'];
|
||||
let txt1 = ctx['text'];
|
||||
return toggler(tKey_1, block1([txt1]));
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
@@ -10,7 +10,8 @@ exports[`translation context body of t-sets are translated in context 1`] = `
|
||||
ctx = Object.create(ctx);
|
||||
ctx[isBoundary] = 1
|
||||
setContextValue(ctx, \\"label\\", \`traduit\`);
|
||||
return text(ctx['label']);
|
||||
const b2 = text(ctx['label']);
|
||||
return multi([b2]);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
@@ -93,23 +94,6 @@ exports[`translation context slot attrs and text contents are translated in cont
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation context t-translation-context with several children 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||
|
||||
let block1 = createBlock(\`<div><div/><div/><block-child-0/></div>\`);
|
||||
|
||||
return function template(ctx, node, key = \\"\\") {
|
||||
let b2;
|
||||
if (true) {
|
||||
b2 = text(\`\`);
|
||||
}
|
||||
return block1([], [b2]);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation context translation of attributes in context 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
@@ -169,21 +153,6 @@ exports[`translation support body of t-sets inside translation=off are not trans
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation support body of t-sets inside translation=off are not translated 2 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, \\"label\\", \`untranslated\`);
|
||||
return text(ctx['label']);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation support body of t-sets with html content are translated 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
@@ -295,23 +264,6 @@ exports[`translation support t-set and falsy t-value: t-body are translated 1`]
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation support t-translation with several children 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
let { text, createBlock, list, multi, html, toggler, comment } = bdom;
|
||||
|
||||
let block1 = createBlock(\`<div><div/><div/><block-child-0/></div>\`);
|
||||
|
||||
return function template(ctx, node, key = \\"\\") {
|
||||
let b2;
|
||||
if (true) {
|
||||
b2 = text(\`\`);
|
||||
}
|
||||
return block1([], [b2]);
|
||||
}
|
||||
}"
|
||||
`;
|
||||
|
||||
exports[`translation support translation is done on the trimmed text, with extra spaces readded after 1`] = `
|
||||
"function anonymous(app, bdom, helpers
|
||||
) {
|
||||
|
||||
@@ -692,7 +692,6 @@ describe("qweb parser", () => {
|
||||
value: "value",
|
||||
defaultValue: null,
|
||||
body: null,
|
||||
hasNoRepresentation: true,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -703,7 +702,6 @@ describe("qweb parser", () => {
|
||||
defaultValue: "ok",
|
||||
value: null,
|
||||
body: null,
|
||||
hasNoRepresentation: true,
|
||||
});
|
||||
|
||||
expect(parse(`<t t-set="v"><div>ok</div></t>`)).toEqual({
|
||||
@@ -725,7 +723,6 @@ describe("qweb parser", () => {
|
||||
content: [{ type: ASTType.Text, value: "ok" }],
|
||||
},
|
||||
],
|
||||
hasNoRepresentation: true,
|
||||
});
|
||||
|
||||
expect(parse(`<t t-set="v"><div>ok</div>abc</t>`)).toEqual({
|
||||
@@ -748,7 +745,6 @@ describe("qweb parser", () => {
|
||||
},
|
||||
{ type: ASTType.Text, value: "abc" },
|
||||
],
|
||||
hasNoRepresentation: true,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -762,7 +758,6 @@ describe("qweb parser", () => {
|
||||
defaultValue: "ok",
|
||||
value: null,
|
||||
body: null,
|
||||
hasNoRepresentation: true,
|
||||
},
|
||||
tElif: null,
|
||||
tElse: null,
|
||||
@@ -788,14 +783,7 @@ describe("qweb parser", () => {
|
||||
condition: "flag",
|
||||
content: { type: ASTType.Text, value: "1" },
|
||||
tElif: null,
|
||||
tElse: {
|
||||
type: ASTType.TSet,
|
||||
name: "ourvar",
|
||||
value: "0",
|
||||
defaultValue: null,
|
||||
body: null,
|
||||
hasNoRepresentation: true,
|
||||
},
|
||||
tElse: { type: ASTType.TSet, name: "ourvar", value: "0", defaultValue: null, body: null },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
@@ -38,34 +38,4 @@ describe("debugging", () => {
|
||||
expect(console.log).toHaveBeenCalledWith(45);
|
||||
console.log = consoleLog;
|
||||
});
|
||||
|
||||
test("t-log: interaction with t-set", () => {
|
||||
const consoleLog = console.log;
|
||||
console.log = jest.fn();
|
||||
|
||||
const template = `
|
||||
<t>
|
||||
<t t-log="foo" t-set="foo" t-value="42"/>
|
||||
<t t-log="bar" t-set="bar" t-value="49"/>
|
||||
<span t-esc="foo + bar"/>
|
||||
</t>
|
||||
`;
|
||||
snapshotTemplate(template);
|
||||
renderToString(template);
|
||||
expect(console.log).toHaveBeenCalledWith(undefined);
|
||||
expect(console.log).toHaveBeenCalledWith(undefined);
|
||||
console.log = consoleLog;
|
||||
});
|
||||
|
||||
test("t-debug: interaction with t-set", () => {
|
||||
const template = `
|
||||
<t>
|
||||
<t t-debug="" t-set="foo" t-value="42"/>
|
||||
<t t-debug="" t-set="bar" t-value="49"/>
|
||||
<span t-esc="foo + bar"/>
|
||||
</t>
|
||||
`;
|
||||
snapshotTemplate(template);
|
||||
renderToString(template);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -63,10 +63,4 @@ describe("t-key", () => {
|
||||
|
||||
expect(renderToString(template2, { key: "1" })).toBe("<div><h1></h1></div>");
|
||||
});
|
||||
|
||||
test("t-key: interaction with t-esc", async () => {
|
||||
const template = `<p t-key="key" t-esc="text"/>`;
|
||||
|
||||
expect(renderToString(template, { key: "1", text: "abc" })).toBe("<p>abc</p>");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -129,21 +129,6 @@ describe("translation support", () => {
|
||||
expect(fixture.innerHTML).toBe("untranslated");
|
||||
});
|
||||
|
||||
test("body of t-sets inside translation=off are not translated 2", async () => {
|
||||
class SomeComponent extends Component {
|
||||
static template = xml`
|
||||
<t>
|
||||
<t t-translation="off" t-set="label">untranslated</t>
|
||||
<t t-esc="label"/>
|
||||
</t>`;
|
||||
}
|
||||
|
||||
const translateFn = () => "translated";
|
||||
|
||||
await mount(SomeComponent, fixture, { translateFn });
|
||||
expect(fixture.innerHTML).toBe("untranslated");
|
||||
});
|
||||
|
||||
test("body of t-sets with html content are translated", async () => {
|
||||
class SomeComponent extends Component {
|
||||
static template = xml`
|
||||
@@ -185,22 +170,6 @@ describe("translation support", () => {
|
||||
await mount(SomeComponent, fixture, { translateFn });
|
||||
expect(fixture.innerHTML).toBe("translated");
|
||||
});
|
||||
|
||||
test("t-translation with several children", async () => {
|
||||
class SomeComponent extends Component {
|
||||
static template = xml`
|
||||
<div>
|
||||
<t t-translation="off">
|
||||
<div/>
|
||||
<div/>
|
||||
</t>
|
||||
<t t-if="true"/>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
await mount(SomeComponent, fixture);
|
||||
expect(fixture.outerHTML).toBe("<div><div><div></div><div></div></div></div>");
|
||||
});
|
||||
});
|
||||
|
||||
describe("translation context", () => {
|
||||
@@ -324,20 +293,4 @@ describe("translation context", () => {
|
||||
expect(translateFn).toHaveBeenCalledWith("param", "fr");
|
||||
expect(translateFn).toHaveBeenCalledWith("title", "pt");
|
||||
});
|
||||
|
||||
test("t-translation-context with several children", async () => {
|
||||
class SomeComponent extends Component {
|
||||
static template = xml`
|
||||
<div>
|
||||
<t t-translation-context="ctx">
|
||||
<div/>
|
||||
<div/>
|
||||
</t>
|
||||
<t t-if="true"/>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
await mount(SomeComponent, fixture);
|
||||
expect(fixture.outerHTML).toBe("<div><div><div></div><div></div></div></div>");
|
||||
});
|
||||
});
|
||||
|
||||
+63
-1
@@ -1,5 +1,7 @@
|
||||
import { batched, EventBus, htmlEscape, markup } from "../src/runtime/utils";
|
||||
import { nextMicroTick } from "./helpers";
|
||||
import { makeTestFixture, nextMicroTick } from "./helpers";
|
||||
import { getCurrent } from "../src/runtime/component_node";
|
||||
import { Component, mount, xml } from "../src";
|
||||
|
||||
describe("event bus behaviour", () => {
|
||||
test("can subscribe and be notified", () => {
|
||||
@@ -33,6 +35,66 @@ describe("event bus behaviour", () => {
|
||||
bus.addEventListener("event", (ev: any) => expect(ev.detail).toBe("hello world"));
|
||||
bus.trigger("event", "hello world");
|
||||
});
|
||||
|
||||
test("events are not validated if the bus is created outside of dev mode", async () => {
|
||||
let bus_empty: EventBus | null = null;
|
||||
class Root extends Component {
|
||||
static template = xml`<div/>`;
|
||||
|
||||
setup() {
|
||||
getCurrent(); // checks that we're in a component context
|
||||
|
||||
bus_empty = new EventBus([]);
|
||||
}
|
||||
}
|
||||
await mount(Root, makeTestFixture());
|
||||
|
||||
bus_empty!.addEventListener("a", () => {});
|
||||
bus_empty!.trigger("a");
|
||||
bus_empty!.dispatchEvent(new CustomEvent("a"));
|
||||
});
|
||||
test("events are validated if the bus is created in dev mode & events are provided", async () => {
|
||||
let bus: EventBus | null = null;
|
||||
let bus_empty: EventBus | null = null;
|
||||
let bbus_no_validation: EventBus | null = null;
|
||||
class Root extends Component {
|
||||
static template = xml`<div/>`;
|
||||
|
||||
setup() {
|
||||
getCurrent(); // checks that we're in a component context
|
||||
|
||||
bus = new EventBus(["a", "b"]);
|
||||
bus_empty = new EventBus([]);
|
||||
bbus_no_validation = new EventBus();
|
||||
}
|
||||
}
|
||||
|
||||
await mount(Root, makeTestFixture(), { test: true });
|
||||
|
||||
bbus_no_validation!.addEventListener("c", () => {});
|
||||
bbus_no_validation!.trigger("c");
|
||||
bbus_no_validation!.dispatchEvent(new CustomEvent("c"));
|
||||
|
||||
bus!.addEventListener("a", () => {});
|
||||
bus!.trigger("a");
|
||||
bus!.dispatchEvent(new CustomEvent("a"));
|
||||
|
||||
expect(() => bus!.addEventListener("c", () => {})).toThrow(
|
||||
"EventBus: subscribing to unknown event 'c'"
|
||||
);
|
||||
expect(() => bus!.trigger("c")).toThrow("EventBus: triggering unknown event 'c'");
|
||||
expect(() => bus!.dispatchEvent(new CustomEvent("c"))).toThrow(
|
||||
"EventBus: dispatching unknown event 'c'"
|
||||
);
|
||||
|
||||
expect(() => bus_empty!.addEventListener("a", () => {})).toThrow(
|
||||
"EventBus: subscribing to unknown event 'a'"
|
||||
);
|
||||
expect(() => bus_empty!.trigger("a")).toThrow("EventBus: triggering unknown event 'a'");
|
||||
expect(() => bus_empty!.dispatchEvent(new CustomEvent("a"))).toThrow(
|
||||
"EventBus: dispatching unknown event 'a'"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("batched", () => {
|
||||
|
||||
Reference in New Issue
Block a user