Merge pull request #68 from jrjohnson/55-find-colocated

Detect and use collocated templates

Author: Turbo87

lib/__tests__/guess-template.js

@@ -0,0 +1,59 @@
+const { possibleTemplatePaths } = require('../transform');
+
+describe('possibleTemplatePaths()', () => {
+  const TESTS = [
+    [
+      'app/components/checkbox.js',
+      ['app/components/checkbox.hbs', 'app/templates/components/checkbox.hbs'],
+    ],
+    [
+      'app/components/nested/sub/checkbox.js',
+      [
+        'app/components/nested/sub/checkbox.hbs',
+        'app/templates/components/nested/sub/checkbox.hbs',
+      ],
+    ],
+    [
+      'app/components/checkbox/component.js',
+      [
+        'app/components/checkbox/template.hbs',
+        'app/components/checkbox/component.hbs',
+        'app/templates/components/checkbox/component.hbs',
+      ],
+    ],
+    [
+      'app/components/nested/sub/component/component.js',
+      [
+        'app/components/nested/sub/component/template.hbs',
+        'app/components/nested/sub/component/component.hbs',
+        'app/templates/components/nested/sub/component/component.hbs',
+      ],
+    ],
+    [
+      'app/components/checkbox.ts',
+      ['app/components/checkbox.hbs', 'app/templates/components/checkbox.hbs'],
+    ],
+    [
+      'app/components/checkbox/component.ts',
+      [
+        'app/components/checkbox/template.hbs',
+        'app/components/checkbox/component.hbs',
+        'app/templates/components/checkbox/component.hbs',
+      ],
+    ],
+    [
+      'app/components/nested/sub/component/component.ts',
+      [
+        'app/components/nested/sub/component/template.hbs',
+        'app/components/nested/sub/component/component.hbs',
+        'app/templates/components/nested/sub/component/component.hbs',
+      ],
+    ],
+  ];
+
+  for (let [input, expected] of TESTS) {
+    test(input, () => {
+      expect(possibleTemplatePaths(input)).toEqual(expected);
+    });
+  }
+});

lib/__tests__/template-paths.js

@@ -11,9 +11,10 @@ const transformTemplate = require('./transform/template');
 function transformPath(componentPath, options) {
   let debug = (fmt, ...args) => _debug(`${componentPath}: ${fmt}`, ...args);
 
-  let templatePath = guessTemplatePath(componentPath);
-  if (!fs.existsSync(templatePath)) {
-    throw new SilentError(`Could not find template at ${templatePath}`);
+  let templatePaths = possibleTemplatePaths(componentPath);
+  let templatePath = templatePaths.find(fs.existsSync);
+  if (!templatePath) {
+    throw new SilentError('Could not find corresponding template file');
   }
   debug('templatePath: %o', templatePath);
 
@@ -99,19 +100,26 @@ function transform(source, template, options = {}) {
   return { source, template };
 }
 
-function guessTemplatePath(componentPath) {
+function possibleTemplatePaths(componentPath) {
+  let classicTemplatePath = componentPath
+    .replace('/components/', '/templates/components/')
+    .replace(/\.(js|ts)$/, '.hbs');
+
+  let colocatedTemplatePath = componentPath.replace(/\.(js|ts)$/, '.hbs');
+
+  let templatePaths = [colocatedTemplatePath, classicTemplatePath];
+
   let isPods = path.basename(componentPath, path.extname(componentPath)) === 'component';
   if (isPods) {
-    return path.dirname(componentPath) + '/template.hbs';
+    let podsTemplatePath = path.dirname(componentPath) + '/template.hbs';
+    templatePaths.unshift(podsTemplatePath);
   }
 
-  return componentPath
-    .replace('/components/', '/templates/components/')
-    .replace(/\.(js|ts)$/, '.hbs');
+  return templatePaths;
 }
 
 module.exports = {
   transform,
   transformPath,
-  guessTemplatePath,
+  possibleTemplatePaths,
 };