Skip to content

Commit 0d6dfe8

Browse files
ryanblockryanblock
committed
Lint
1 parent 33fa9a0 commit 0d6dfe8

35 files changed

+91
-96
lines changed

‎src/config/pragmas/http.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module.exports = function configureHTTP ({ arc, inventory, errors }) {
5959
arcStaticAssetProxy: true,
6060
pragma: 'http',
6161
method: 'get',
62-
path: '/*'
62+
path: '/*',
6363
}
6464
asap.config.shared = false
6565
asap.config.views = false

‎src/config/pragmas/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ let { all: allPragmas } = pragmas
44
// Get all pragmas except special cases
55
let isSpecial = p => [ 'plugins', 'shared', 'views' ].includes(p)
66
let visitors = allPragmas.map(p => {
7-
// eslint-disable-next-line
87
if (!isSpecial(p)) return require(`./${p}`)
98
}).filter(Boolean)
109

‎src/config/pragmas/plugins.js

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module.exports = async function getPluginModules ({ arc, inventory, errors }) {
5151
/* istanbul ignore next: idk why but for some reason nyc isn't picking up the catches; all cases are covered in tests, though! */
5252
if (type === 'plugin') {
5353
try {
54-
// eslint-disable-next-line
5554
plugins[name] = require(pluginPath)
5655
}
5756
catch (err) {
@@ -69,7 +68,6 @@ module.exports = async function getPluginModules ({ arc, inventory, errors }) {
6968
}
7069
// Remap @macros to deploy.start
7170
if (type === 'macro') {
72-
// eslint-disable-next-line
7371
plugins[name] = { deploy: { start: require(pluginPath) } }
7472
}
7573
// Walk each plugin and build the method tree

‎src/config/pragmas/populate-lambda/_scheduled.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let get = {
2626
dayOfWeek: bits[4],
2727
year: bits[5],
2828
}
29-
}
29+
},
3030
}
3131

3232
module.exports = function populateScheduled (params) {

‎src/config/pragmas/populate-lambda/get-handler.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function getExt ({ runtime, src, errors }) {
9393
}
9494
}
9595

96-
function findHandler (arr, src){
96+
function findHandler (arr, src) {
9797
for (let handler of arr) {
9898
if (existsSync(join(src, handler))) {
9999
let bits = handler.split('.')

‎src/config/pragmas/shared.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = function configureShared ({ arc, pragmas, inventory, errors })
1111
let src = join(projSrc, 'shared')
1212
let shared = {
1313
src: null,
14-
shared: []
14+
shared: [],
1515
}
1616

1717
let foundPluginSrc, foundArcSrc, required = false

‎src/config/pragmas/tables-indexes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = function configureTablesIndexes ({ arc, inventory, errors }) {
3131
plugins: indexesSetters,
3232
inventory,
3333
type: 'indexes',
34-
valid: { name: 'string' }
34+
valid: { name: 'string' },
3535
})
3636
if (plugins) indexes.push(...plugins)
3737

‎src/config/pragmas/tables.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = function configureTables ({ arc, inventory, errors }) {
2626
plugins: tablesSetters,
2727
inventory,
2828
type: 'tables',
29-
valid: { name: 'string' }
29+
valid: { name: 'string' },
3030
})
3131
if (plugins) tables.push(...plugins)
3232

‎src/config/pragmas/validate/_proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = function validateProxy (proxy, errors) {
77
errors.push(`Invalid @proxy protocol: ${url}`)
88
}
99
}
10-
catch (e) {
10+
catch {
1111
errors.push(`Invalid @proxy URL: ${url}`)
1212
}
1313
})

‎src/config/pragmas/validate/_tables.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = function validateTablesAndIndexes (pragma, pragmaName, errors)
4343
deepStrictEqual(index, expect)
4444
return true
4545
}
46-
catch (err) {
46+
catch {
4747
return false
4848
}
4949
})

‎src/config/pragmas/validate/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable global-require */
21
module.exports = {
32
// Pragmas and project validation
43
aws: require('./_aws'),
@@ -15,5 +14,5 @@ module.exports = {
1514
websockets: require('./_websockets'),
1615

1716
// Misc
18-
validate: require('./_lib')
17+
validate: require('./_lib'),
1918
}

‎src/config/pragmas/views.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = function configureViews ({ arc, pragmas, inventory, errors }) {
1515
let src = join(projSrc, 'views')
1616
let views = {
1717
src: null,
18-
views: []
18+
views: [],
1919
}
2020

2121
let foundPluginSrc, foundArcSrc, required = false

‎src/config/project/prefs/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@ module.exports = function getPrefs ({ scope, inventory, errors }) {
8787
_arc: prefs.arc,
8888
_raw: prefs.raw,
8989
},
90-
preferencesFile: prefs.filepath
90+
preferencesFile: prefs.filepath,
9191
}
9292
}

‎src/env/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ module.exports = function env (params, inventory, callback) {
1212
let name = inventory.app
1313
let { profile, region } = inventory.aws
1414
let result = []
15-
// eslint-disable-next-line
1615
let awsLite = require('@aws-lite/client')
17-
/* istanbul ignore next */ // eslint-disable-next-line
16+
/* istanbul ignore next */
1817
awsLite({ profile, region, plugins: [ import('@aws-lite/ssm') ] }).then(_aws => {
1918
aws = _aws
2019

@@ -24,7 +23,7 @@ module.exports = function env (params, inventory, callback) {
2423
Recursive: true,
2524
MaxResults: 10,
2625
WithDecryption: true,
27-
paginate: true
26+
paginate: true,
2827
}
2928
aws.ssm.GetParametersByPath(params).then(data => {
3029
// Tidy up the response

‎src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function architectInventory (params = {}, callback) {
8484
// Userland: fill out the pragmas, starting with @plugins
8585
inventory = {
8686
...inventory,
87-
...config.pragmas(project)
87+
...config.pragmas(project),
8888
}
8989

9090
// End here if first-pass validation failed
@@ -107,7 +107,7 @@ module.exports = function architectInventory (params = {}, callback) {
107107
else {
108108
callback(null, {
109109
inv: inventory,
110-
get: get(inventory)
110+
get: get(inventory),
111111
})
112112
}
113113
})

‎src/lib/pragmas.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ module.exports = {
4545
'jsonapi',
4646
'text',
4747
'xml',
48-
]
48+
],
4949
}

‎src/read/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let functionConfig = {
1818

1919
// Local preferences
2020
let preferences = {
21-
arc: [ 'preferences.arc', 'prefs.arc', '.preferences.arc', '.prefs.arc', ],
21+
arc: [ 'preferences.arc', 'prefs.arc', '.preferences.arc', '.prefs.arc' ],
2222
// TODO add json, yaml later if folks want it?
2323
}
2424

‎src/validate/layers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function validateARN ({ layers, region, config }) {
6767
if (region !== layerRegion) {
6868
badRegions.push(
6969
` - Layer ARN: ${arn}\n` +
70-
` - Layer region: ${layerRegion}`
70+
` - Layer region: ${layerRegion}`,
7171
)
7272
}
7373
})

‎src/validate/paths.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function checkFilePaths (inventory, errors) {
88
if (proj.build && !ascii.test(proj.build)) return err('Build')
99

1010
let { lambdasBySrcDir } = inventory
11-
if (lambdasBySrcDir){
11+
if (lambdasBySrcDir) {
1212
Object.values(lambdasBySrcDir).forEach(lambdae => {
1313
if (!Array.isArray(lambdae)) lambdae = [ lambdae ] // Normalize possible multi-tenant Lambdas
1414
lambdae.forEach(lambda => {

‎test/integration/preferences-test.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ testing
6666
env_var_2 bar
6767
`
6868
let tmp = mockTmp({
69-
[globalPrefsFile]: prefsText
69+
[globalPrefsFile]: prefsText,
7070
})
7171
overrideHomedir(tmp)
7272
inv({ cwd }, (err, result) => {
@@ -113,7 +113,7 @@ test('Get local preferences', t => {
113113
env: {
114114
testing: { 'env_var_1': 'foo', 'env_var_2': 'bar' },
115115
staging: { 'env_var_1': 'fiz', 'env_var_2': 'buz' },
116-
production: { 'env_var_1': 'qix qix', 'env_var_2': 'qux qux' }
116+
production: { 'env_var_1': 'qix qix', 'env_var_2': 'qux qux' },
117117
},
118118
}
119119
inv({ cwd }, (err, result) => {
@@ -159,42 +159,42 @@ testing
159159
let globalPrefs = {
160160
sandbox: {
161161
environment: 'testing',
162-
quiet: true
162+
quiet: true,
163163
},
164164
deploy: false,
165165
env: {
166166
testing: { 'env_var_1': 'foo', 'env_var_2': 'bar' },
167167
staging: null,
168168
production: null,
169-
}
169+
},
170170
}
171171
let localPrefs = {
172172
sandbox: {
173173
environment: 'staging',
174174
},
175175
create: {
176-
autocreate: true
176+
autocreate: true,
177177
},
178178
env: {
179179
testing: { 'env_var_2': 'bar' },
180180
staging: { 'env_var_3': 'fiz' },
181181
production: null,
182-
}
182+
},
183183
}
184184
let prefs = {
185185
sandbox: {
186186
environment: 'staging',
187-
quiet: true
187+
quiet: true,
188188
},
189189
deploy: false,
190190
create: {
191-
autocreate: true
191+
autocreate: true,
192192
},
193193
env: {
194194
testing: { 'env_var_2': 'bar' },
195195
staging: { 'env_var_3': 'fiz' },
196196
production: null,
197-
}
197+
},
198198
}
199199
let tmp = mockTmp({
200200
[globalPrefsFile]: globalPrefsText,

‎test/unit/src/config/pragmas/events-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test('@events population: complex format', t => {
5050
`${values[0]}
5151
src ${values[0]}/path`,
5252
`${values[1]}
53-
src ${values[1]}/path`
53+
src ${values[1]}/path`,
5454
]
5555
let arc = parse(`
5656
@events
@@ -75,7 +75,7 @@ test('@events population: complex format + fallback to default paths', t => {
7575
`${values[0]}
7676
whatever thingo`,
7777
`${values[1]}
78-
whatever thingo`
78+
whatever thingo`,
7979
]
8080
let arc = parse(`
8181
@events

‎test/unit/src/config/pragmas/meta/src-dirs-test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ test('Lambda source dir population', t => {
2424
let pragmas = {
2525
http: [
2626
{ src: values[0] },
27-
{ src: values[1] }
27+
{ src: values[1] },
2828
],
2929
events: [
3030
{ src: values[2] },
31-
{ src: values[3] }
31+
{ src: values[3] },
3232
],
33-
scheduled: null
33+
scheduled: null,
3434
}
3535

3636
let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas })
@@ -52,8 +52,8 @@ test('Multiple Lambdas mapped to the same source dir', t => {
5252
{ src: values[1] },
5353
],
5454
events: [
55-
{ src: values[2] }
56-
]
55+
{ src: values[2] },
56+
],
5757
}
5858

5959
let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas })
@@ -80,9 +80,9 @@ test('HTTP Arc Static Asset Proxy handler', t => {
8080
{
8181
name: 'get /*',
8282
arcStaticAssetProxy: true,
83-
src: null
84-
}
85-
]
83+
src: null,
84+
},
85+
],
8686
}
8787

8888
let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas })
@@ -95,8 +95,8 @@ test('Lambdas missing src errors', t => {
9595
t.plan(1)
9696
let pragmas = {
9797
http: [
98-
{ name: 'get /' }
99-
]
98+
{ name: 'get /' },
99+
],
100100
}
101101
let errors = []
102102
populateSrcDirs({ pragmas, errors })

‎test/unit/src/config/pragmas/populate-lambda/get-handler-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ test('Handler properties (Node.js module systems)', t => {
229229
errors = []
230230
cwd = mockTmp({ [src]: {
231231
[`${file}.mjs`]: 'hi',
232-
'package.json': JSON.stringify({})
232+
'package.json': JSON.stringify({}),
233233
} })
234234
result = getHandler({ config, src: join(cwd, src), errors })
235235
t.notOk(errors.length, 'Did not get handler errors')

‎test/unit/src/config/pragmas/queues-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ test('@queues population: complex format', t => {
8181
`${values[0]}
8282
src ${values[0]}/path`,
8383
`${values[1]}
84-
src ${values[1]}/path`
84+
src ${values[1]}/path`,
8585
]
8686
let arc = parse(`
8787
@queues
@@ -106,7 +106,7 @@ test('@queues population: complex format + fallback to default paths', t => {
106106
`${values[0]}
107107
whatever thingo`,
108108
`${values[1]}
109-
whatever thingo`
109+
whatever thingo`,
110110
]
111111
let arc = parse(`
112112
@queues

0 commit comments

Comments
 (0)