Skip to content

Commit 172fbb1

Browse files
author
Robert Jackson
authored
Merge pull request #133 from ember-codemods/convert-to-single-quote
[REFACTOR] Convert to single quote
2 parents fe4eb8d + dd95ed2 commit 172fbb1

45 files changed

Lines changed: 651 additions & 841 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.prettierrc.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
"use strict";
1+
'use strict';
22

33
module.exports = {
4-
singleQuote: false,
5-
trailingComma: "none"
4+
singleQuote: true,
5+
trailingComma: 'es5',
6+
printWidth: 100,
67
};

‎bin/cli.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/usr/bin/env node
2-
"use strict";
2+
'use strict';
33

4-
const gatherTelemetry = require("../lib/gather-telemetry");
4+
const gatherTelemetry = require('../lib/gather-telemetry');
55

66
(async () => {
77
await gatherTelemetry(process.argv[2]);
88

9-
require("codemod-cli").runTransform(
9+
require('codemod-cli').runTransform(
1010
__dirname,
11-
"ember-object",
11+
'ember-object',
1212
process.argv.slice(2) /* paths or globs */
1313
);
1414
})();

‎bin/temeletry.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
2-
"use strict";
2+
'use strict';
33

4-
const gatherTelemetry = require("../lib/gather-telemetry");
4+
const gatherTelemetry = require('../lib/gather-telemetry');
55

66
gatherTelemetry(process.argv[2]);

‎lib/cache.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const Cache = require("sync-disk-cache");
2-
const getRepoInfo = require("git-repo-info");
1+
const Cache = require('sync-disk-cache');
2+
const getRepoInfo = require('git-repo-info');
33

44
const gitInfo = getRepoInfo();
55
const cache = new Cache(`native-class-codemod-${gitInfo.sha}-${process.cwd()}`);

‎lib/gather-telemetry.js‎

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
const puppeteer = require("puppeteer");
2-
const cache = require("./cache");
1+
const puppeteer = require('puppeteer');
2+
const cache = require('./cache');
33

44
module.exports = async function gatherTelemetry(url) {
55
const browser = await puppeteer.launch({ ignoreHTTPSErrors: true });
66
const page = await browser.newPage();
77

88
await page.goto(url);
99

10-
await page.exposeFunction("logErrorInNodeProcess", message => {
10+
await page.exposeFunction('logErrorInNodeProcess', message => {
1111
console.error(message); // eslint-disable-line no-console
1212
});
1313

1414
// Get the "viewport" of the page, as reported by the page.
1515
const telemetry = await page.evaluate(() => {
16-
const SKIPPED_MODULES = ["fetch/ajax"];
16+
const SKIPPED_MODULES = ['fetch/ajax'];
1717

1818
/* globals window, Ember */
1919
let telemetry = {};
@@ -35,9 +35,7 @@ module.exports = async function gatherTelemetry(url) {
3535
}
3636
} catch (error) {
3737
// log the error, but continue
38-
window.logErrorInNodeProcess(
39-
`error evaluating \`${modulePath}\`: ${error.message}`
40-
);
38+
window.logErrorInNodeProcess(`error evaluating \`${modulePath}\`: ${error.message}`);
4139
}
4240
}
4341

@@ -49,18 +47,15 @@ module.exports = async function gatherTelemetry(url) {
4947
*/
5048
function getType(object) {
5149
const types = [
52-
"Application",
53-
"Controller",
54-
"Route",
55-
"Component",
56-
"Service",
57-
"Router",
58-
"Engine"
50+
'Application',
51+
'Controller',
52+
'Route',
53+
'Component',
54+
'Service',
55+
'Router',
56+
'Engine',
5957
];
60-
return (
61-
types.find(type => Ember[type] && object instanceof Ember[type]) ||
62-
"EmberObject"
63-
);
58+
return types.find(type => Ember[type] && object instanceof Ember[type]) || 'EmberObject';
6459
}
6560

6661
/**
@@ -85,32 +80,24 @@ module.exports = async function gatherTelemetry(url) {
8580
const { source } = meta;
8681
const type = getType(source);
8782

88-
const ownProperties = Object.keys(source).filter(
89-
key => !["_super", "actions"].includes(key)
90-
);
83+
const ownProperties = Object.keys(source).filter(key => !['_super', 'actions'].includes(key));
9184

9285
const ownActions = source.actions ? Object.keys(source.actions) : [];
9386

9487
const observedProperties = Object.keys(meta._watching || {});
9588

96-
const overriddenProperties = ownProperties.filter(key =>
97-
isOverridden(meta.parent, key)
98-
);
89+
const overriddenProperties = ownProperties.filter(key => isOverridden(meta.parent, key));
9990

100-
const overriddenActions = ownActions.filter(key =>
101-
isActionOverridden(meta.parent, key)
102-
);
91+
const overriddenActions = ownActions.filter(key => isActionOverridden(meta.parent, key));
10392

10493
const computedProperties = [];
10594
meta.forEachDescriptors((name, desc) => {
10695
const descProto = Object.getPrototypeOf(desc) || {};
107-
const constructorName = descProto.constructor
108-
? descProto.constructor.name
109-
: "";
96+
const constructorName = descProto.constructor ? descProto.constructor.name : '';
11097
if (
11198
desc.enumerable &&
11299
ownProperties.includes(name) &&
113-
constructorName === "ComputedProperty"
100+
constructorName === 'ComputedProperty'
114101
) {
115102
computedProperties.push(name);
116103
}
@@ -119,16 +106,16 @@ module.exports = async function gatherTelemetry(url) {
119106
const { offProperties, unobservedProperties } = ownProperties.reduce(
120107
({ offProperties, unobservedProperties }, key) => {
121108
const { type, events } = getListenerData(meta.parent, key);
122-
if (type === "event") {
109+
if (type === 'event') {
123110
offProperties[key] = events;
124-
} else if (type === "observer") {
111+
} else if (type === 'observer') {
125112
unobservedProperties[key] = events;
126113
}
127114
return { offProperties, unobservedProperties };
128115
},
129116
{
130117
offProperties: {},
131-
unobservedProperties: {}
118+
unobservedProperties: {},
132119
}
133120
);
134121

@@ -147,7 +134,7 @@ module.exports = async function gatherTelemetry(url) {
147134
overriddenProperties,
148135
ownProperties,
149136
type,
150-
unobservedProperties
137+
unobservedProperties,
151138
};
152139
}
153140

@@ -162,24 +149,21 @@ module.exports = async function gatherTelemetry(url) {
162149
*/
163150
function getListenerData(map, key) {
164151
while (map) {
165-
let type = "event";
166-
const events = parseListeners(map._listeners).reduce(
167-
(acc, [event, , method]) => {
168-
if (method === key) {
169-
const [observedProp, observerEvent] = event.split(":");
170-
if (observerEvent) {
171-
type = "observer";
172-
}
173-
acc.push(observedProp);
152+
let type = 'event';
153+
const events = parseListeners(map._listeners).reduce((acc, [event, , method]) => {
154+
if (method === key) {
155+
const [observedProp, observerEvent] = event.split(':');
156+
if (observerEvent) {
157+
type = 'observer';
174158
}
175-
return acc;
176-
},
177-
[]
178-
);
159+
acc.push(observedProp);
160+
}
161+
return acc;
162+
}, []);
179163
if (events.length) {
180164
return {
181165
type,
182-
events
166+
events,
183167
};
184168
}
185169
map = map.parent;
@@ -197,12 +181,12 @@ module.exports = async function gatherTelemetry(url) {
197181
function parseListeners(listeners = [], size = 4) {
198182
var result = [];
199183
if (listeners.length) {
200-
if (typeof listeners[0] === "object") {
184+
if (typeof listeners[0] === 'object') {
201185
result = listeners.map(({ event, target, method, kind }) => [
202186
event,
203187
target,
204188
method,
205-
kind
189+
kind,
206190
]);
207191
} else {
208192
const input = listeners.slice(0);
@@ -257,7 +241,7 @@ module.exports = async function gatherTelemetry(url) {
257241
return telemetry;
258242
});
259243

260-
cache.set("telemetry", JSON.stringify(telemetry));
244+
cache.set('telemetry', JSON.stringify(telemetry));
261245

262246
await browser.close();
263247
};

‎test/fixtures/input/app/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import config from './config/environment';
66
const App = Application.extend({
77
modulePrefix: config.modulePrefix,
88
podModulePrefix: config.podModulePrefix,
9-
Resolver
9+
Resolver,
1010
});
1111

1212
loadInitializers(App, config.modulePrefix);

‎test/fixtures/input/app/components/test-component.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import Component from "@ember/component";
2-
import { computed } from "@ember/object";
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
33

44
function fullNameMacro() {
5-
return computed("firstName", "lastName", function() {
5+
return computed('firstName', 'lastName', function() {
66
return `${this.firstName} ${this.lastName}`;
77
});
88
}
99

1010
export default Component.extend({
11-
fullName: fullNameMacro()
11+
fullName: fullNameMacro(),
1212
});

‎test/fixtures/input/app/router.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import config from './config/environment';
33

44
const Router = EmberRouter.extend({
55
location: config.locationType,
6-
rootURL: config.rootURL
6+
rootURL: config.rootURL,
77
});
88

9-
Router.map(function() {
10-
});
9+
Router.map(function() {});
1110

1211
export default Router;

‎test/fixtures/output/app/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import classic from "ember-classic-decorator";
1+
import classic from 'ember-classic-decorator';
22
import Application from '@ember/application';
33
import Resolver from './resolver';
44
import loadInitializers from 'ember-load-initializers';

‎test/fixtures/output/app/components/test-component.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import classic from "ember-classic-decorator";
2-
import { computed } from "@ember/object";
3-
import Component from "@ember/component";
1+
import classic from 'ember-classic-decorator';
2+
import { computed } from '@ember/object';
3+
import Component from '@ember/component';
44

55
function fullNameMacro() {
6-
return computed("firstName", "lastName", function() {
6+
return computed('firstName', 'lastName', function() {
77
return `${this.firstName} ${this.lastName}`;
88
});
99
}

0 commit comments

Comments
 (0)