diff --git a/src/app.ts b/src/app.ts index b1cbae41..7950e0f2 100644 --- a/src/app.ts +++ b/src/app.ts @@ -2,7 +2,7 @@ import { Component } from "./component/component"; import { ComponentNode } from "./component/component_node"; import { MountOptions } from "./component/fibers"; import { Scheduler } from "./component/scheduler"; -import { TemplateSet } from "./qweb/template_helpers"; +import { TemplateSet } from "./compiler/template_helpers"; // reimplement dev mode stuff see last change in 0f7a8289a6fb8387c3c1af41c6664b2a8448758f diff --git a/src/qweb/compiler.ts b/src/compiler/code_generator.ts similarity index 100% rename from src/qweb/compiler.ts rename to src/compiler/code_generator.ts diff --git a/src/qweb/inline_expressions.ts b/src/compiler/inline_expressions.ts similarity index 100% rename from src/qweb/inline_expressions.ts rename to src/compiler/inline_expressions.ts diff --git a/src/qweb/parser.ts b/src/compiler/parser.ts similarity index 100% rename from src/qweb/parser.ts rename to src/compiler/parser.ts diff --git a/src/qweb/template_helpers.ts b/src/compiler/template_helpers.ts similarity index 98% rename from src/qweb/template_helpers.ts rename to src/compiler/template_helpers.ts index 432de023..32180646 100644 --- a/src/qweb/template_helpers.ts +++ b/src/compiler/template_helpers.ts @@ -1,5 +1,5 @@ import { BDom, createBlock, html, list, multi, text, toggler } from "../blockdom"; -import { compileTemplate, Template } from "./compiler"; +import { compileTemplate, Template } from "./code_generator"; import { component } from "../component/component_node"; import { validateProps } from "../component/props_validation"; diff --git a/src/tags.ts b/src/tags.ts index fedf101d..b18c2892 100644 --- a/src/tags.ts +++ b/src/tags.ts @@ -1,5 +1,5 @@ import { registerSheet } from "./component/style"; -import { globalTemplates } from "./qweb/template_helpers"; +import { globalTemplates } from "./compiler/template_helpers"; // ----------------------------------------------------------------------------- // Global templates diff --git a/tests/qweb/__snapshots__/attributes.test.ts.snap b/tests/compiler/__snapshots__/attributes.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/attributes.test.ts.snap rename to tests/compiler/__snapshots__/attributes.test.ts.snap diff --git a/tests/qweb/__snapshots__/comments.test.ts.snap b/tests/compiler/__snapshots__/comments.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/comments.test.ts.snap rename to tests/compiler/__snapshots__/comments.test.ts.snap diff --git a/tests/qweb/__snapshots__/error_handling.test.ts.snap b/tests/compiler/__snapshots__/error_handling.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/error_handling.test.ts.snap rename to tests/compiler/__snapshots__/error_handling.test.ts.snap diff --git a/tests/qweb/__snapshots__/event_handling.test.ts.snap b/tests/compiler/__snapshots__/event_handling.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/event_handling.test.ts.snap rename to tests/compiler/__snapshots__/event_handling.test.ts.snap diff --git a/tests/qweb/__snapshots__/misc.test.ts.snap b/tests/compiler/__snapshots__/misc.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/misc.test.ts.snap rename to tests/compiler/__snapshots__/misc.test.ts.snap diff --git a/tests/qweb/__snapshots__/parser.test.ts.snap b/tests/compiler/__snapshots__/parser.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/parser.test.ts.snap rename to tests/compiler/__snapshots__/parser.test.ts.snap diff --git a/tests/qweb/__snapshots__/qweb_memory.test.ts.snap b/tests/compiler/__snapshots__/qweb_memory.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/qweb_memory.test.ts.snap rename to tests/compiler/__snapshots__/qweb_memory.test.ts.snap diff --git a/tests/qweb/__snapshots__/simple_templates.test.ts.snap b/tests/compiler/__snapshots__/simple_templates.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/simple_templates.test.ts.snap rename to tests/compiler/__snapshots__/simple_templates.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_call.test.ts.snap b/tests/compiler/__snapshots__/t_call.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_call.test.ts.snap rename to tests/compiler/__snapshots__/t_call.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_debug_log.test.ts.snap b/tests/compiler/__snapshots__/t_debug_log.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_debug_log.test.ts.snap rename to tests/compiler/__snapshots__/t_debug_log.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_esc.test.ts.snap b/tests/compiler/__snapshots__/t_esc.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_esc.test.ts.snap rename to tests/compiler/__snapshots__/t_esc.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_foreach.test.ts.snap b/tests/compiler/__snapshots__/t_foreach.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_foreach.test.ts.snap rename to tests/compiler/__snapshots__/t_foreach.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_if.test.ts.snap b/tests/compiler/__snapshots__/t_if.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_if.test.ts.snap rename to tests/compiler/__snapshots__/t_if.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_key.test.ts.snap b/tests/compiler/__snapshots__/t_key.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_key.test.ts.snap rename to tests/compiler/__snapshots__/t_key.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_raw.test.ts.snap b/tests/compiler/__snapshots__/t_raw.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_raw.test.ts.snap rename to tests/compiler/__snapshots__/t_raw.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_ref.test.ts.snap b/tests/compiler/__snapshots__/t_ref.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_ref.test.ts.snap rename to tests/compiler/__snapshots__/t_ref.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_set.test.ts.snap b/tests/compiler/__snapshots__/t_set.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_set.test.ts.snap rename to tests/compiler/__snapshots__/t_set.test.ts.snap diff --git a/tests/qweb/__snapshots__/t_tag.test.ts.snap b/tests/compiler/__snapshots__/t_tag.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/t_tag.test.ts.snap rename to tests/compiler/__snapshots__/t_tag.test.ts.snap diff --git a/tests/qweb/__snapshots__/translation.test.ts.snap b/tests/compiler/__snapshots__/translation.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/translation.test.ts.snap rename to tests/compiler/__snapshots__/translation.test.ts.snap diff --git a/tests/qweb/__snapshots__/white_space.test.ts.snap b/tests/compiler/__snapshots__/white_space.test.ts.snap similarity index 100% rename from tests/qweb/__snapshots__/white_space.test.ts.snap rename to tests/compiler/__snapshots__/white_space.test.ts.snap diff --git a/tests/qweb/attributes.test.ts b/tests/compiler/attributes.test.ts similarity index 100% rename from tests/qweb/attributes.test.ts rename to tests/compiler/attributes.test.ts diff --git a/tests/qweb/comments.test.ts b/tests/compiler/comments.test.ts similarity index 100% rename from tests/qweb/comments.test.ts rename to tests/compiler/comments.test.ts diff --git a/tests/qweb/error_handling.test.ts b/tests/compiler/error_handling.test.ts similarity index 100% rename from tests/qweb/error_handling.test.ts rename to tests/compiler/error_handling.test.ts diff --git a/tests/qweb/event_handling.test.ts b/tests/compiler/event_handling.test.ts similarity index 99% rename from tests/qweb/event_handling.test.ts rename to tests/compiler/event_handling.test.ts index 083a1933..ee758098 100644 --- a/tests/qweb/event_handling.test.ts +++ b/tests/compiler/event_handling.test.ts @@ -1,4 +1,4 @@ -import { TemplateSet } from "../../src/qweb/template_helpers"; +import { TemplateSet } from "../../src/compiler/template_helpers"; import { mount } from "../../src/blockdom"; import { makeTestFixture, renderToBdom, renderToString, snapshotEverything } from "../helpers"; diff --git a/tests/qweb/inline_expressions.test.ts b/tests/compiler/inline_expressions.test.ts similarity index 99% rename from tests/qweb/inline_expressions.test.ts rename to tests/compiler/inline_expressions.test.ts index 0c78023d..97e4cd52 100644 --- a/tests/qweb/inline_expressions.test.ts +++ b/tests/compiler/inline_expressions.test.ts @@ -1,4 +1,4 @@ -import { compileExpr, tokenize } from "../../src/qweb/inline_expressions"; +import { compileExpr, tokenize } from "../../src/compiler/inline_expressions"; describe("tokenizer", () => { test("simple tokens", () => { diff --git a/tests/qweb/misc.test.ts b/tests/compiler/misc.test.ts similarity index 100% rename from tests/qweb/misc.test.ts rename to tests/compiler/misc.test.ts diff --git a/tests/qweb/parser.test.ts b/tests/compiler/parser.test.ts similarity index 99% rename from tests/qweb/parser.test.ts rename to tests/compiler/parser.test.ts index c29f6338..1b8f3b5d 100644 --- a/tests/qweb/parser.test.ts +++ b/tests/compiler/parser.test.ts @@ -1,4 +1,4 @@ -import { ASTType, parse } from "../../src/qweb/parser"; +import { ASTType, parse } from "../../src/compiler/parser"; describe("qweb parser", () => { // --------------------------------------------------------------------------- diff --git a/tests/qweb/qweb_memory.test.ts b/tests/compiler/qweb_memory.test.ts similarity index 100% rename from tests/qweb/qweb_memory.test.ts rename to tests/compiler/qweb_memory.test.ts diff --git a/tests/qweb/simple_templates.test.ts b/tests/compiler/simple_templates.test.ts similarity index 100% rename from tests/qweb/simple_templates.test.ts rename to tests/compiler/simple_templates.test.ts diff --git a/tests/qweb/svg.test.ts b/tests/compiler/svg.test.ts similarity index 100% rename from tests/qweb/svg.test.ts rename to tests/compiler/svg.test.ts diff --git a/tests/qweb/t_call.test.ts b/tests/compiler/t_call.test.ts similarity index 100% rename from tests/qweb/t_call.test.ts rename to tests/compiler/t_call.test.ts diff --git a/tests/qweb/t_debug_log.test.ts b/tests/compiler/t_debug_log.test.ts similarity index 100% rename from tests/qweb/t_debug_log.test.ts rename to tests/compiler/t_debug_log.test.ts diff --git a/tests/qweb/t_esc.test.ts b/tests/compiler/t_esc.test.ts similarity index 100% rename from tests/qweb/t_esc.test.ts rename to tests/compiler/t_esc.test.ts diff --git a/tests/qweb/t_foreach.test.ts b/tests/compiler/t_foreach.test.ts similarity index 100% rename from tests/qweb/t_foreach.test.ts rename to tests/compiler/t_foreach.test.ts diff --git a/tests/qweb/t_if.test.ts b/tests/compiler/t_if.test.ts similarity index 100% rename from tests/qweb/t_if.test.ts rename to tests/compiler/t_if.test.ts diff --git a/tests/qweb/t_key.test.ts b/tests/compiler/t_key.test.ts similarity index 100% rename from tests/qweb/t_key.test.ts rename to tests/compiler/t_key.test.ts diff --git a/tests/qweb/t_raw.test.ts b/tests/compiler/t_raw.test.ts similarity index 100% rename from tests/qweb/t_raw.test.ts rename to tests/compiler/t_raw.test.ts diff --git a/tests/qweb/t_ref.test.ts b/tests/compiler/t_ref.test.ts similarity index 98% rename from tests/qweb/t_ref.test.ts rename to tests/compiler/t_ref.test.ts index 3ab0ae15..eeab5ad5 100644 --- a/tests/qweb/t_ref.test.ts +++ b/tests/compiler/t_ref.test.ts @@ -1,4 +1,4 @@ -import { TemplateSet } from "../../src/qweb/template_helpers"; +import { TemplateSet } from "../../src/compiler/template_helpers"; import { mount } from "../../src/blockdom"; import { renderToBdom, snapshotEverything } from "../helpers"; diff --git a/tests/qweb/t_set.test.ts b/tests/compiler/t_set.test.ts similarity index 100% rename from tests/qweb/t_set.test.ts rename to tests/compiler/t_set.test.ts diff --git a/tests/qweb/t_tag.test.ts b/tests/compiler/t_tag.test.ts similarity index 100% rename from tests/qweb/t_tag.test.ts rename to tests/compiler/t_tag.test.ts diff --git a/tests/qweb/translation.test.ts b/tests/compiler/translation.test.ts similarity index 100% rename from tests/qweb/translation.test.ts rename to tests/compiler/translation.test.ts diff --git a/tests/qweb/validation.test.ts b/tests/compiler/validation.test.ts similarity index 95% rename from tests/qweb/validation.test.ts rename to tests/compiler/validation.test.ts index 904a3397..a057b313 100644 --- a/tests/qweb/validation.test.ts +++ b/tests/compiler/validation.test.ts @@ -1,4 +1,4 @@ -import { TemplateSet } from "../../src/qweb/template_helpers"; +import { TemplateSet } from "../../src/compiler/template_helpers"; import { renderToString, TestContext, compile } from "../helpers"; // ----------------------------------------------------------------------------- diff --git a/tests/qweb/white_space.test.ts b/tests/compiler/white_space.test.ts similarity index 100% rename from tests/qweb/white_space.test.ts rename to tests/compiler/white_space.test.ts diff --git a/tests/helpers.ts b/tests/helpers.ts index 372bbb36..2137a2cf 100644 --- a/tests/helpers.ts +++ b/tests/helpers.ts @@ -14,8 +14,8 @@ import { } from "../src"; import { BDom } from "../src/blockdom"; import { blockDom } from "../src"; -import { CompileOptions, compileTemplate, Template } from "../src/qweb/compiler"; -import { globalTemplates, TemplateSet, UTILS } from "../src/qweb/template_helpers"; +import { CompileOptions, compileTemplate, Template } from "../src/compiler/code_generator"; +import { globalTemplates, TemplateSet, UTILS } from "../src/compiler/template_helpers"; import { xml } from "../src/tags"; const mount = blockDom.mount;