Merge pull request #515 from SassDoc/hotfix/scoped-packages

Add support for scoped theme packages

Author: pascalduez

src/environment.js

@@ -198,10 +198,20 @@ export default class Environment extends EventEmitter {
       return this.defaultTheme()
     }
 
-    if (this.theme.indexOf('/') === -1) {
+    const hasSlash = this.theme.includes('/')
+    const isScoped = this.theme.startsWith('@') && hasSlash
+
+    // We assume it's a full scoped package name.
+    if (isScoped) {
+      return this.tryTheme(this.theme)
+    }
+
+    // We assume it's a theme name shorthand.
+    if (!hasSlash) {
       return this.tryTheme(`sassdoc-theme-${this.theme}`)
     }
 
+    // We assume it's a path to a local theme.
     let theme = this.resolve(this.theme, this.themeCwd)
     this.themeName = this.theme
     this.displayTheme = path.relative(process.cwd(), theme)

test/env/environment.test.js

@@ -213,6 +213,31 @@ describe('#environment', function () {
     })
   })
 
+  /**
+   * A scoped package is passed as theme.
+   */
+  describe('#theme-scoped', function () {
+    beforeEach(function () {
+      env.load({ theme: '@test/sassdoc-theme-test' })
+      env.postProcess()
+      env.data = []
+      mkdirp.sync('.sassdoc')
+      return env.theme('.sassdoc', env)
+    })
+
+    it('should warn and render the default theme', function () {
+      assert.notEqual(-1, warnings[0].indexOf('Theme `@test/sassdoc-theme-test` not found'))
+      assert.notEqual(-1, warnings[1].indexOf('Falling back to default theme'))
+      assert.ok(env.themeName === 'default')
+      assert.ok(fs.existsSync('.sassdoc/index.html'))
+      assert.ok(fs.existsSync('.sassdoc/assets'))
+    })
+
+    after(function (done) {
+      rimraf('.sassdoc', done)
+    })
+  })
+
   /**
    * ensureEnvironment
    */