diff --git a/odoo/addons/test_assetsbundle/tests/test_js_transpiler_regex.py b/odoo/addons/test_assetsbundle/tests/test_js_transpiler_regex.py index 3c6816d96d2a94f0b133d0a8b5ad5c8043a6ad47..1f2006b1566f4997123d26d796816b224da42de1 100644 --- a/odoo/addons/test_assetsbundle/tests/test_js_transpiler_regex.py +++ b/odoo/addons/test_assetsbundle/tests/test_js_transpiler_regex.py @@ -19,17 +19,21 @@ class TestJsTranspiler(TransactionCase): '// @odoo-module alias=web.test', '/* @odoo-module alias=web.test', '/** @odoo-module alias=web.test', + '/** @odoo-module alias=web.test**/', '/* @odoo-module alias=web.test ', '/* @odoo-module alias=web.test default=false', '/* @odoo-module alias=web.test default=false ', + '/* @odoo-module alias=web.test default=false**/', ] for case in cases: assert ODOO_MODULE_RE.match(case), "URL_RE is failing... >%s<" % case if "alias" in case: assert ODOO_MODULE_RE.match(case).groupdict().get('alias'), "URL_RE is failing for alias... >%s<" % case + assert ODOO_MODULE_RE.match(case).groupdict().get('alias') == "web.test", "URL_RE does not get the right alias for ... >%s<" % case if "default" in case: assert ODOO_MODULE_RE.match(case).groupdict().get('default'), "URL_RE is failing for default... >%s<" % case + assert ODOO_MODULE_RE.match(case).groupdict().get('default') == "false", "URL_RE does not get the right default for ... >%s<" % case def test_incorrect_ODOO_MODULE_RE(self): cases = [ diff --git a/odoo/tools/js_transpiler.py b/odoo/tools/js_transpiler.py index 9329a581bc5331d1f3b9ad24c6e9f14232712a03..707d46b558569114d1ea03af27e0a38f9c1a3b2d 100644 --- a/odoo/tools/js_transpiler.py +++ b/odoo/tools/js_transpiler.py @@ -537,10 +537,10 @@ def relative_path_to_module_path(url, path_rel): ODOO_MODULE_RE = re.compile(r""" - \s* # some starting space + \s* # some starting space \/(\*|\/).*\s* # // or /* @odoo-module # @odoo-module - (\s+alias=(?P<alias>\S+))? # alias=web.AbstractAction (optional) + (\s+alias=(?P<alias>[\w.]+))? # alias=web.AbstractAction (optional) (\s+default=(?P<default>False|false|0))? # default=False or false or 0 (optional) """, re.VERBOSE)