Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support json5 syntax #73

Merged
merged 5 commits into from
Jan 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.0-development",
"dependencies": {
"json-to-ts": "^1.6.0",
"json5": "^2.2.2",
"minimist": "^1.2.0",
"prettier": "^1.19.1",
"ramda": "^0.27.0"
Expand Down
5 changes: 4 additions & 1 deletion src/loadFileConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
*/
import * as fs from 'fs'
import * as R from 'ramda'
import * as JSON5 from 'json5'
import {configPaths, ConfigTypes, NonConfigEnv} from './configPaths'

const readAndParse = R.pipe((file: string) => fs.readFileSync(file, 'utf8'), JSON5.parse)

export type Configurations<T> = {[key in keyof T]: any}

/**
Expand All @@ -19,7 +22,7 @@ export const loadFileConfigs = <T extends NonConfigEnv>(
process: T
): Configurations<ConfigTypes> => {
const itar: any = R.mapObjIndexed(
R.ifElse(fs.existsSync, require, R.always({}))
R.ifElse(fs.existsSync, readAndParse, R.always({}))
)
return itar(configPaths(process))
}
17 changes: 13 additions & 4 deletions test/loadFileConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,22 @@

import * as assert from 'assert'
import * as path from 'path'
import * as fs from 'fs'
import * as JSON5 from 'json5'
import {loadFileConfigs} from '../src/loadFileConfigs'
import * as defaultConfig from './stub-module/config/default.json'
import * as deploymentConfig from './stub-module/config/deployment/www.example.com.json'
import * as envConfig from './stub-module/config/env/production.json'
import * as userConfig from './stub-module/config/user/root.json'

describe('load-file-configs', () => {

const [defaultConfig, deploymentConfig, envConfig, userConfig] = [
'default',
'deployment/www.example.com',
'env/production',
'user/root'
].map(file => `./stub-module/config/${file}.json`)
.map(file => path.resolve(__dirname, file))
.map(file => fs.readFileSync(file, 'utf8'))
.map(config => JSON5.parse(config))

it('should load the configs that are available', () => {
const process = {
cwd: () => path.resolve(__dirname, 'stub-module'),
Expand Down
1 change: 1 addition & 0 deletions test/stub-module/config/default.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "default",
// The port the server will listen on
"port": 9000,
"maxRetries": "@@MAX_RETRIES"
}
41 changes: 7 additions & 34 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2115,7 +2115,7 @@ debug@^2.2.0, debug@^2.3.3:
dependencies:
ms "2.0.0"

debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
Expand Down Expand Up @@ -3287,7 +3287,7 @@ import-lazy@^2.1.0:
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
Expand Down Expand Up @@ -3792,6 +3792,11 @@ json5@^2.1.0:
dependencies:
minimist "^1.2.0"

json5@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==

jsonfile@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
Expand Down Expand Up @@ -4077,11 +4082,6 @@ lockfile@^1.0.4:
dependencies:
signal-exit "^3.0.2"

lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=

lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
Expand All @@ -4090,33 +4090,11 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"

lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=

lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=

lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
dependencies:
lodash._getnative "^3.0.0"

lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=

lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=

lodash._root@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
Expand Down Expand Up @@ -4157,11 +4135,6 @@ lodash.map@^4.5.1:
resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=

lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=

lodash.set@^4.3.2:
version "4.3.2"
resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
Expand Down