Merge pull request #136 from Turbo87/cleanup

Cleanup file structure

Author: Robert Jackson

package.json

@@ -26,7 +26,7 @@
   },
   "jest": {
     "collectCoverageFrom": [
-      "transforms/angle-brackets/transforms/**/*.{js,jsx}"
+      "transforms/angle-brackets/transform.js"
     ]
   },
   "dependencies": {

transforms/-preset.js

@@ -1,5 +1,37 @@
-'use strict';
+const { getOptions: getCLIOptions } = require('codemod-cli');
+const path = require('path');
+const fs = require('fs');
 
-const preset = require('../-preset');
+const transform = require('./transform');
 
-module.exports = preset('angle-brackets');
+function getOptions() {
+  let options = {};
+
+  let cliOptions = getCLIOptions();
+  if (cliOptions.config) {
+    let filePath = path.join(process.cwd(), cliOptions.config);
+    let config = JSON.parse(fs.readFileSync(filePath));
+
+    if (config.helpers) {
+      options.helpers = config.helpers;
+    }
+
+    if (config.skipFilesThatMatchRegex) {
+      options.skipFilesThatMatchRegex = new RegExp(config.skipFilesThatMatchRegex);
+    }
+
+    options.skipBuiltInComponents = !!config.skipBuiltInComponents;
+  }
+
+  return options;
+}
+
+module.exports = function(file) {
+  try {
+    return transform(file, getOptions());
+  } catch (e) {
+    throw new Error(
+      `Transformation errored on file ${file.path}. Reason ${e}. Please report this in https://github.com/ember-codemods/ember-angle-brackets-codemod/issues\n\nStack trace:\n${e.stack}`
+    );
+  }
+};

transforms/angle-brackets/index.js

@@ -1,32 +1,8 @@
 const glimmer = require('@glimmer/syntax');
 const prettier = require('prettier');
-const path = require('path');
-const fs = require('fs');
 
 const _EMPTY_STRING_ = `ANGLE_BRACKET_EMPTY_${Date.now()}`;
 
-class Config {
-  constructor(options) {
-    this.helpers = [];
-    this.skipBuiltInComponents = false;
-
-    if (options.config) {
-      let filePath = path.join(process.cwd(), options.config);
-      let config = JSON.parse(fs.readFileSync(filePath));
-
-      if (config.helpers) {
-        this.helpers = config.helpers;
-      }
-
-      if (config.skipFilesThatMatchRegex) {
-        this.skipFilesThatMatchRegex = new RegExp(config.skipFilesThatMatchRegex);
-      }
-
-      this.skipBuiltInComponents = !!config.skipBuiltInComponents;
-    }
-  }
-}
-
 /**
  * List of HTML attributes for which @ should not be appended
  */
@@ -148,28 +124,28 @@ const IGNORE_MUSTACHE_STATEMENTS = [
   'app-version',
 ];
 
-const isAttribute = key => {
+function isAttribute(key) {
   return HTML_ATTRIBUTES.includes(key) || key.startsWith('data-');
-};
+}
 
-const isNestedComponentTagName = tagName => {
+function isNestedComponentTagName(tagName) {
   return tagName && tagName.includes && (tagName.includes('/') || tagName.includes('-'));
-};
+}
 
 /**
  *  Returns a capitalized tagname for angle brackets syntax
  *  {{my-component}} => MyComponent
  */
-const capitalizedTagName = tagname => {
+function capitalizedTagName(tagname) {
   return tagname
     .split('-')
     .map(s => {
       return s[0].toUpperCase() + s.slice(1);
     })
     .join('');
-};
+}
 
-const transformTagName = tagName => {
+function transformTagName(tagName) {
   if (tagName.includes('.')) {
     return tagName;
   }
@@ -179,14 +155,14 @@ const transformTagName = tagName => {
   }
 
   return capitalizedTagName(tagName);
-};
+}
 
-const transformNestedTagName = tagName => {
+function transformNestedTagName(tagName) {
   const paths = tagName.split('/');
   return paths.map(name => capitalizedTagName(name)).join('::');
-};
+}
 
-const transformNestedSubExpression = subExpression => {
+function transformNestedSubExpression(subExpression) {
   let positionalArgs = subExpression.params.map(param => {
     if (param.type === 'SubExpression') {
       return transformNestedSubExpression(param);
@@ -214,9 +190,9 @@ const transformNestedSubExpression = subExpression => {
 
   let args = positionalArgs.concat(namedArgs);
   return `(${subExpression.path.original} ${args.join(' ')})`;
-};
+}
 
-const shouldSkipFile = (fileInfo, config) => {
+function shouldSkipFile(fileInfo, config) {
   let source = fileInfo.source;
 
   if (source.includes('~')) {
@@ -235,18 +211,14 @@ const shouldSkipFile = (fileInfo, config) => {
   }
 
   return false;
-};
+}
 
-/**
- * exports
- *
- * @param fileInfo
- * @param api
- * @param options
- * @returns {undefined}
- */
-module.exports = function(fileInfo, api, options) {
-  const config = new Config(options);
+module.exports = function transform(fileInfo, config) {
+  config = config || {};
+  config.helpers = config.helpers || [];
+  config.skipBuiltInComponents =
+    'skipBuiltInComponents' in config ? config.skipBuiltInComponents : false;
+  config.skipFilesThatMatchRegex = config.skipFilesThatMatchRegex || null;
 
   if (shouldSkipFile(fileInfo, config)) {
     return fileInfo.source;
@@ -256,12 +228,13 @@ module.exports = function(fileInfo, api, options) {
     mode: 'codemod',
     parseOptions: { ignoreStandalone: true },
   });
+
   const b = glimmer.builders;
 
   /**
    * Transform the attributes names & values properly
    */
-  const transformAttrs = attrs => {
+  function transformAttrs(attrs) {
     return attrs.map(a => {
       let _key = a.key;
       let _valueType = a.value.type;
@@ -308,26 +281,26 @@ module.exports = function(fileInfo, api, options) {
 
       return b.attr(_key, _value);
     });
-  };
+  }
 
-  const isQueryParam = param => {
+  function isQueryParam(param) {
     return (
       param &&
       param.type === 'SubExpression' &&
       param.path &&
       param.path.original === 'query-params'
     );
-  };
+  }
 
-  const transformLinkToTextParam = textParam => {
+  function transformLinkToTextParam(textParam) {
     if (textParam.type.includes('Literal')) {
       return b.text(textParam.value);
     } else {
       return b.mustache(textParam.original);
     }
-  };
+  }
 
-  const transformModelParams = modelParam => {
+  function transformModelParams(modelParam) {
     let type = modelParam.type;
     if (type === 'StringLiteral') {
       return b.text(modelParam.value);
@@ -336,9 +309,9 @@ module.exports = function(fileInfo, api, options) {
     } else {
       return b.mustache(modelParam.original);
     }
-  };
+  }
 
-  const transformLinkToAttrs = params => {
+  function transformLinkToAttrs(params) {
     let attributes = [];
     let dataAttributes = getDataAttributesFromParams(params);
     params = getNonDataAttributesFromParams(params);
@@ -389,36 +362,36 @@ module.exports = function(fileInfo, api, options) {
     }
 
     return attributes.concat(dataAttributes);
-  };
+  }
 
-  const tranformValuelessDataParams = params => {
+  function tranformValuelessDataParams(params) {
     let dataAttributes = getDataAttributesFromParams(params);
     let valuelessDataAttributes = dataAttributes.map(param =>
       b.attr(param.parts[0], b.text(_EMPTY_STRING_))
     );
     return valuelessDataAttributes;
-  };
+  }
 
-  const transformNodeAttributes = node => {
+  function transformNodeAttributes(node) {
     let params = tranformValuelessDataParams(node.params);
     let attributes = transformAttrs(node.hash.pairs);
 
     return params.concat(attributes);
-  };
+  }
 
-  const getDataAttributesFromParams = params => {
+  function getDataAttributesFromParams(params) {
     return params.filter(param => param.original && `${param.original}`.startsWith('data-'));
-  };
+  }
 
-  const getNonDataAttributesFromParams = params => {
+  function getNonDataAttributesFromParams(params) {
     return params.filter(p => !(p.original && `${p.original}`.startsWith('data-')));
-  };
+  }
 
-  const shouldIgnoreMustacheStatement = name => {
+  function shouldIgnoreMustacheStatement(name) {
     return IGNORE_MUSTACHE_STATEMENTS.includes(name) || config.helpers.includes(name);
-  };
+  }
 
-  const nodeHasPositionalParameters = node => {
+  function nodeHasPositionalParameters(node) {
     if (node.params.length > 0) {
       let firstParamType = node.params[0].type;
 
@@ -432,9 +405,9 @@ module.exports = function(fileInfo, api, options) {
     }
 
     return false;
-  };
+  }
 
-  const transformNode = node => {
+  function transformNode(node) {
     const tagName = node.path.original;
 
     if (config.skipBuiltInComponents && BUILT_IN_COMPONENTS.includes(tagName)) {
@@ -476,7 +449,7 @@ module.exports = function(fileInfo, api, options) {
       children,
       blockParams,
     });
-  };
+  }
 
   glimmer.traverse(ast, {
     MustacheStatement(node) {