Removes config options for template aliases #207.

11ty · Jan 10, 2019 · f2218f8 · f2218f8
1 parent 3115dd4
commit f2218f8
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 38 deletions.
diff --git a/src/EleventyExtensionMap.js b/src/EleventyExtensionMap.js
@@ -2,22 +2,25 @@ const TemplatePath = require("./TemplatePath");
 const config = require("./Config");
 
 class EleventyExtensionMap {
-  constructor(formats = []) {
-    this.config = config.getConfig();
-
-    this.unfilteredFormats = formats.map(function(key) {
+  constructor(formatKeys = []) {
+    this.unfilteredFormatKeys = formatKeys.map(function(key) {
       return key.trim().toLowerCase();
     });
 
-    this.formats = this.unfilteredFormats.filter(key => this.hasExtension(key));
+    this.formatKeys = this.unfilteredFormatKeys.filter(key =>
+      this.hasExtension(key)
+    );
 
-    this.prunedFormats = this.unfilteredFormats.filter(
+    this.prunedFormatKeys = this.unfilteredFormatKeys.filter(
       key => !this.hasExtension(key)
     );
   }
 
-  setConfig(configOverride) {
-    this.config = configOverride || {};
+  get config() {
+    return this.configOverride || config.getConfig();
+  }
+  set config(cfg) {
+    this.configOverride = cfg;
   }
 
   /* Used for layout path resolution */
@@ -27,9 +30,9 @@ class EleventyExtensionMap {
     }
 
     let files = [];
-    this.formats.forEach(
+    this.formatKeys.forEach(
       function(key) {
-        this.getExtensions(key).forEach(function(extension) {
+        this.getExtensionsFromKey(key).forEach(function(extension) {
           files.push((dir ? dir + "/" : "") + path + "." + extension);
         });
       }.bind(this)
@@ -39,24 +42,24 @@ class EleventyExtensionMap {
   }
 
   getPrunedGlobs(inputDir) {
-    return this._getGlobs(this.prunedFormats, inputDir);
+    return this._getGlobs(this.prunedFormatKeys, inputDir);
   }
 
   getGlobs(inputDir) {
     if (this.config.passthroughFileCopy) {
-      return this._getGlobs(this.unfilteredFormats, inputDir);
+      return this._getGlobs(this.unfilteredFormatKeys, inputDir);
     }
 
-    return this._getGlobs(this.formats, inputDir);
+    return this._getGlobs(this.formatKeys, inputDir);
   }
 
-  _getGlobs(formats, inputDir) {
+  _getGlobs(formatKeys, inputDir) {
     let dir = TemplatePath.convertToGlob(inputDir);
     let globs = [];
-    formats.forEach(
+    formatKeys.forEach(
       function(key) {
         if (this.hasExtension(key)) {
-          this.getExtensions(key).forEach(function(extension) {
+          this.getExtensionsFromKey(key).forEach(function(extension) {
             globs.push(dir + "/*." + extension);
           });
         } else {
@@ -76,10 +79,6 @@ class EleventyExtensionMap {
     return false;
   }
 
-  getExtensions(key) {
-    return this.getExtensionsFromKey(key);
-  }
-
   getExtensionsFromKey(key) {
     let extensions = [];
     for (var extension in this.keyMap) {
@@ -129,13 +128,12 @@ class EleventyExtensionMap {
 
   get keyMap() {
     return EleventyExtensionMap._getKeyMap(
-      this.config.templateExtensionAliases
+      this.config.templateExtensionAliases || {}
     );
   }
-
   static get keyMap() {
     return EleventyExtensionMap._getKeyMap(
-      config.getConfig().templateExtensionAliases
+      config.getConfig().templateExtensionAliases || {}
     );
   }
 

diff --git a/src/UserConfig.js b/src/UserConfig.js
@@ -51,7 +51,7 @@ class UserConfig {
     this.dataDeepMerge = false;
     this.experiments = new Set();
     // this.userExtensionMap = {};
-    this.templateExtensionAliases = {};
+    // this.templateExtensionAliases = {};
     this.watchJavaScriptDependencies = true;
     this.browserSyncConfig = {};
   }
@@ -483,9 +483,9 @@ class UserConfig {
     this.dataDeepMerge = !!deepMerge;
   }
 
-  addTemplateExtensionAlias(targetKey, extension) {
-    this.templateExtensionAliases[extension] = targetKey;
-  }
+  // addTemplateExtensionAlias(targetKey, extension) {
+  //   this.templateExtensionAliases[extension] = targetKey;
+  // }
 
   setWatchJavaScriptDependencies(watchEnabled) {
     this.watchJavaScriptDependencies = !!watchEnabled;
@@ -524,7 +524,7 @@ class UserConfig {
       useGitIgnore: this.useGitIgnore,
       dataDeepMerge: this.dataDeepMerge,
       experiments: this.experiments,
-      templateExtensionAliases: this.templateExtensionAliases,
+      // templateExtensionAliases: this.templateExtensionAliases,
       watchJavaScriptDependencies: this.watchJavaScriptDependencies,
       browserSyncConfig: this.browserSyncConfig
     };

diff --git a/test/EleventyExtensionMapTest.js b/test/EleventyExtensionMapTest.js
@@ -18,17 +18,17 @@ test("Multiple formats", t => {
 
 test("Invalid keys are filtered (no passthrough copy)", t => {
   let map = new EleventyExtensionMap(["lksdjfjlsk"]);
-  map.setConfig({
+  map.config = {
     passthroughFileCopy: false
-  });
+  };
   t.deepEqual(map.getGlobs(), []);
 });
 
 test("Invalid keys are filtered (using passthrough copy)", t => {
   let map = new EleventyExtensionMap(["lksdjfjlsk"]);
-  map.setConfig({
+  map.config = {
     passthroughFileCopy: true
-  });
+  };
   t.deepEqual(map.getGlobs(), ["./**/*.lksdjfjlsk"]);
 });
 
@@ -110,12 +110,12 @@ test("getKey", t => {
 
 test("Extension aliasing (one format key)", t => {
   let map = new EleventyExtensionMap(["md"]);
-  map.setConfig({
+  map.config = {
     templateExtensionAliases: {
       markdown: "md",
       nunjucks: "njk" // N/A to current format list
     }
-  });
+  };
   t.deepEqual(map.getExtensionsFromKey("md"), ["md", "markdown"]);
   t.deepEqual(map.getExtensionsFromKey("njk"), ["njk", "nunjucks"]);
 
@@ -125,12 +125,12 @@ test("Extension aliasing (one format key)", t => {
 
 test("Extension aliasing (two format keys)", t => {
   let map = new EleventyExtensionMap(["md", "njk"]);
-  map.setConfig({
+  map.config = {
     templateExtensionAliases: {
       markdown: "md",
       nunjucks: "njk"
     }
-  });
+  };
   t.deepEqual(map.getExtensionsFromKey("md"), ["md", "markdown"]);
   t.deepEqual(map.getExtensionsFromKey("njk"), ["njk", "nunjucks"]);
 

diff --git a/test/EleventyFilesTest.js b/test/EleventyFilesTest.js
@@ -371,11 +371,11 @@ test("Glob Watcher Files with passthroughAll", async t => {
 
 test("File extension aliasing", async t => {
   let map = new EleventyExtensionMap(["md"]);
-  map.setConfig({
+  map.config = {
     templateExtensionAliases: {
       markdown: "md"
     }
-  });
+  };
 
   let evf = new EleventyFiles(
     "./test/stubs/writeTestMarkdown",