javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 11:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(builder): handle modules with "/" or "~/" (#7418)

Browse Source
This commit is contained in:
Alexander Vakrilov
2019-06-28 15:38:42 +03:00
committed by Manol Donev
parent 4437cd622b
commit 8851835cb1
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/ui/builder/builder-tests.ts
View File

@ -1,5 +1,5 @@
import { createViewFromEntry } from "tns-core-modules/ui/builder"; import { createViewFromEntry } from "tns-core-modules/ui/builder";
import { assertEqual, assertNull, assertThrows } from "../../tk-unit"; import { assertEqual, assertNull, assertThrows, assertNotNull } from "../../tk-unit";
const COMPONENT_MODULE = "ui/builder/component-module"; const COMPONENT_MODULE = "ui/builder/component-module";
const MISSING_MODULE = "ui/builder/missing-module"; const MISSING_MODULE = "ui/builder/missing-module";
@ -22,7 +22,17 @@ export function test_view_is_NOT_module_root_component() {
assertNull(undefinedModule, `View<${nestedView}> should NOT be a root component of a module.`); assertNull(undefinedModule, `View<${nestedView}> should NOT be a root component of a module.`);
} }
export function test_load_component_from_missing_module_throws() { export function test_create_view_from_entry_from_missing_module_throws() {
assertThrows(() => getViewComponent(MISSING_MODULE), assertThrows(() => getViewComponent(MISSING_MODULE),
"Loading component from a missing module SHOULD throw an error."); "Loading component from a missing module SHOULD throw an error.");
} }
export function test_create_view_from_entry_with_path_with_slash() {
const view = getViewComponent("/" + COMPONENT_MODULE);
assertNotNull(view, `Module starting with "/" could not be loaded`);
}
export function test_create_view_from_entry_with_path_with_tilde() {
const view = getViewComponent("~/" + COMPONENT_MODULE);
assertNotNull(view, `Module starting with "~/" could not be loaded`);
}

7
tns-core-modules/ui/builder/builder.ts
View File

@ -57,20 +57,21 @@ export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEn
return view; return view;
} else if (entry.moduleName) { } else if (entry.moduleName) {
const resolvedCodeModuleName = resolveModuleName(entry.moduleName, ""); //`${moduleName}.xml`; const moduleName = sanitizeModuleName(entry.moduleName);
const resolvedCodeModuleName = resolveModuleName(moduleName, ""); //`${moduleName}.xml`;
let moduleExports = resolvedCodeModuleName ? global.loadModule(resolvedCodeModuleName) : null; let moduleExports = resolvedCodeModuleName ? global.loadModule(resolvedCodeModuleName) : null;
if (moduleExports && moduleExports.createPage) { if (moduleExports && moduleExports.createPage) {
// Exports has a createPage() method // Exports has a createPage() method
const view = moduleExports.createPage(); const view = moduleExports.createPage();
const resolvedCssModuleName = resolveModuleName(entry.moduleName, "css"); //entry.moduleName + ".css"; const resolvedCssModuleName = resolveModuleName(moduleName, "css"); //entry.moduleName + ".css";
if (resolvedCssModuleName) { if (resolvedCssModuleName) {
view.addCssFile(resolvedCssModuleName); view.addCssFile(resolvedCssModuleName);
} }
return view; return view;
} else { } else {
const componentModule = loadInternal(entry.moduleName, moduleExports); const componentModule = loadInternal(moduleName, moduleExports);
const componentView = componentModule && componentModule.component; const componentView = componentModule && componentModule.component;
return componentView; return componentView;