require local blueprints start with .

Previously we had logic to detect the difference between a subdir with the name "foo" and an npm package "foo". This prevented a self referencings blueprints "." because it would be considered a subdir. Now we avoid this problem by requiring local blueprints start with ".". So "foo" => "./foo".

Author: Kelly Selden

src/parse-blueprint-package.js

@@ -14,21 +14,22 @@ function toPosixAbsolutePath(path) {
   return posixPath;
 }
 
-// https://stackoverflow.com/a/45242825/1703845
-function isSubDir(base, test) {
-  let relative = path.relative(base, test);
-  return !relative.startsWith('..') && !path.isAbsolute(relative);
-}
-
 async function parseBlueprintPackage({
   cwd = '.',
   blueprint
 }) {
   let name;
   let location;
   let url;
-  let blueprintPath = path.resolve(cwd, blueprint);
-  if (await fs.pathExists(blueprintPath) && !isSubDir(cwd, blueprintPath)) {
+  let blueprintPath;
+
+  if (blueprint.startsWith('.')) {
+    blueprintPath = path.resolve(cwd, blueprint);
+  } else if (path.isAbsolute(blueprint) && await fs.pathExists(blueprint)) {
+    blueprintPath = blueprint;
+  }
+
+  if (blueprintPath) {
     let posixBlueprintPath = toPosixAbsolutePath(blueprintPath);
     url = `git+file://${posixBlueprintPath}`;
     location = blueprint;
@@ -42,6 +43,7 @@ async function parseBlueprintPackage({
       name = blueprint;
     }
   }
+
   return {
     name,
     location,

test/integration/parse-blueprint-package-test.js

@@ -23,39 +23,43 @@ describe(parseBlueprintPackage, function() {
     });
   });
 
-  it('ignores subdirs that collide with blueprint names', async function() {
-    let blueprint = 'config';
+  it('detects urls', async function() {
+    let blueprint = 'http://test-blueprint.com';
 
     let parsedPackage = await parseBlueprintPackage({
-      cwd: path.resolve(__dirname, '../fixtures/blueprint/app/local-app/local/my-app'),
       blueprint
     });
 
     expect(parsedPackage).to.deep.equal({
-      name: blueprint,
-      location: undefined,
-      url: undefined
+      name: undefined,
+      location: blueprint,
+      url: blueprint
     });
   });
 
-  it('detects urls', async function() {
-    let blueprint = 'http://test-blueprint.com';
+  it('detects npm packages', async function() {
+    let blueprint = 'test-blueprint';
 
     let parsedPackage = await parseBlueprintPackage({
       blueprint
     });
 
     expect(parsedPackage).to.deep.equal({
-      name: undefined,
-      location: blueprint,
-      url: blueprint
+      name: blueprint,
+      location: undefined,
+      url: undefined
     });
   });
 
-  it('detects npm packages', async function() {
-    let blueprint = 'test-blueprint';
+  it('uses npm even if subdir match', async function() {
+    let blueprint = 'config';
+
+    let cwd = path.resolve(__dirname, '../fixtures/blueprint/app/local-app/local/my-app');
+
+    expect(cwd).to.be.a.directory().and.include.subDirs([blueprint]);
 
     let parsedPackage = await parseBlueprintPackage({
+      cwd,
       blueprint
     });