Merge pull request #32 from AthennaIO/develop

feat(template): remove relative path

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@athenna/view",
- "version": "4.16.0",
+ "version": "4.17.0",
  "description": "The Athenna template engine. Built on top of Edge.js.",
  "license": "MIT",
  "author": "João Lenon <[email protected]>",

src/views/ViewImpl.ts

@@ -310,8 +310,18 @@ export class ViewImpl {
  * View.createComponentByPath('myTemplate', path)
  * ```
  */
- public createComponentByPath(name: string, componentPath: string): ViewImpl {
- const file = new File(componentPath)
+ public createComponentByPath(name: string, path: string): ViewImpl {
+ if (!isAbsolute(path)) {
+ debug(
+ 'Path %s for view disk is not absolute and is going to be resolved using cwd %s.',
+ path,
+ Path.pwd()
+ )
+
+ path = resolve(Path.pwd(), path)
+ }
+
+ const file = new File(path)
 
  return this.createTemplate(name, file.getContentAsStringSync())
  }
@@ -390,8 +400,18 @@ export class ViewImpl {
  * View.createTemplateByPath('myTemplate', path)
  * ```
  */
- public createTemplateByPath(name: string, templatePath: string): ViewImpl {
- const file = new File(templatePath, Buffer.from(''))
+ public createTemplateByPath(name: string, path: string): ViewImpl {
+ if (!isAbsolute(path)) {
+ debug(
+ 'Path %s for view disk is not absolute and is going to be resolved using cwd %s.',
+ path,
+ Path.pwd()
+ )
+
+ path = resolve(Path.pwd(), path)
+ }
+
+ const file = new File(path, Buffer.from(''))
 
  if (!file.fileExists) {
  return this

tests/unit/views/ViewImplTest.ts

@@ -290,6 +290,20 @@ export default class ViewImplTest {
  assert.isTrue(content.includes('lenon <lenon>'))
  }
 
+ @Test()
+ public async shouldBeAbleToCreateAComponentByARelativeFilePath({ assert }: Context) {
+ View.createComponentByPath('ui.copyright', 'tests/fixtures/views/components/copyright.edge')
+
+ const content = await View.render('ui.copyright', {
+ package: 'view',
+ author: 'lenon',
+ email: 'lenon'
+ })
+
+ assert.isTrue(content.includes('@athenna/view'))
+ assert.isTrue(content.includes('lenon <lenon>'))
+ }
+
  @Test()
  public async shouldThrowAlreadyExistComponentExceptionIfTryingToCreateWithTheSameName({ assert }: Context) {
  assert.throws(() => View.createComponent('button', ''), AlreadyExistComponentException)
@@ -353,6 +367,20 @@ export default class ViewImplTest {
  assert.isTrue(content.includes('lenon <lenon>'))
  }
 
+ @Test()
+ public async shouldBeAbleToCreateATemplateByRelativeFilePath({ assert }: Context) {
+ View.createTemplateByPath('ui.copyright', 'tests/fixtures/views/components/copyright.edge')
+
+ const content = await View.render('ui.copyright', {
+ package: 'view',
+ author: 'lenon',
+ email: 'lenon'
+ })
+
+ assert.isTrue(content.includes('@athenna/view'))
+ assert.isTrue(content.includes('lenon <lenon>'))
+ }
+
  @Test()
  public async shouldNotThrowErrorsWhenCreatingATemplateByFilePathThatDoesNotExist({ assert }: Context) {
  assert.doesNotThrow(() => View.createTemplateByPath('not-found', Path.fixtures('not-found.edge')))