Cleanup

Author: simonihmig

lib/__tests__/find-properties.js

@@ -6,7 +6,7 @@ const {
   findAttributeBindings,
   findClassNames,
   findClassNameBindings,
-} = require('../utils');
+} = require('../utils/classic');
 
 describe('findTagName()', () => {
   const TESTS = [

lib/transform/classic.js

@@ -11,7 +11,7 @@ const {
   findAriaRole,
   isMethod,
   isProperty,
-} = require('../utils');
+} = require('../utils/classic');
 
 const EVENT_HANDLER_METHODS = [
   // Touch events

lib/transform/native.js

@@ -7,14 +7,12 @@ const {
   addClassDecorator,
   findTagName,
   findElementId,
-  findDecorator,
   findClassNames,
   findClassNameBindings,
   findAttributeBindings,
   isMethod,
   removeDecorator,
   ensureImport,
-  removeImport,
   isProperty,
 } = require('../utils/native');
 

lib/transform/template.js

@@ -1,4 +1,4 @@
-const { indentLines } = require('../utils');
+const { indentLines } = require('../utils/classic');
 
 const templateRecast = require('ember-template-recast');
 

lib/utils.js lib/utils/classic.jslib/utils.js renamed to lib/utils/classic.js

@@ -1,6 +1,6 @@
 const j = require('jscodeshift').withParser('ts');
 
-const SilentError = require('./silent-error');
+const SilentError = require('../silent-error');
 
 function isProperty(path, name) {
   let node = path.value;

lib/utils/native.js

@@ -78,28 +78,8 @@ function findTagName(path) {
   return findStringDecorator(path, 'tagName', 'div');
 }
 
-function findElementId(properties) {
-  return findStringProperty(properties, 'elementId');
-}
-
-function findStringArrayProperties(properties, name) {
-  let propertyPath = properties.filter(path => isProperty(path, name))[0];
-  if (!propertyPath) {
-    return [];
-  }
-
-  let arrayPath = propertyPath.get('value');
-  if (arrayPath.value.type !== 'ArrayExpression') {
-    throw new SilentError(`Unexpected \`${name}\` value: ${j(arrayPath).toSource()}`);
-  }
-
-  return arrayPath.get('elements').value.map(element => {
-    if (element.type !== 'StringLiteral') {
-      throw new SilentError(`Unexpected \`${name}\` value: ${j(arrayPath).toSource()}`);
-    }
-
-    return element.value;
-  });
+function findElementId(path) {
+  return findStringProperty(path, 'elementId');
 }
 
 function findStringArrayDecorator(path, name) {
@@ -251,8 +231,6 @@ module.exports = {
   addClassDecorator,
   isProperty,
   isMethod,
-  findStringProperty,
-  findStringArrayProperties,
   findAttributeBindings,
   findClassNames,
   findClassNameBindings,