Skip to content
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
40 changes: 40 additions & 0 deletions projects/start-sdk/lib/test/fileHelper.merge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,44 @@ describe('FileHelper.merge', () => {
expect(readFileSync(path, 'utf-8')).toContain('old')
},
)

// A transformer can leave a key undefined that the data never named, the
// way a form-to-file mapping does for an unset setting.
test.each(['env', 'ini', 'yaml', 'toml'])(
'%s drops a key its onWrite leaves undefined',
async kind => {
const path = seeded(`transformed.${kind}`, '')
const file = (FileHelper as any)[kind](
path,
shape,
...(kind === 'ini' || kind === 'yaml' ? [undefined] : []),
{
onRead: (raw: Record<string, unknown>) => raw,
onWrite: (data: { A: string }) => ({ A: data.A, K: undefined }),
},
)

await file.write(effects, { A: 'keep' })

expect(readFileSync(path, 'utf-8')).not.toContain('undefined')
expect(readFileSync(path, 'utf-8')).toContain('keep')
},
)

test('raw hands its writer no key merged as undefined', async () => {
const path = seeded('undefined.raw', 'A=keep\nK=old\n')
const file = FileHelper.raw(
path,
(data: { A: string; K?: string }) =>
Object.entries(data)
.map(([k, v]) => `${k}=${v}`)
.join('\n'),
raw => Object.fromEntries(raw.split('\n').map(line => line.split('='))),
data => shape.parse(data),
)

await file.merge(effects, { K: undefined })

expect(readFileSync(path, 'utf-8')).toBe('A=keep')
})
})
33 changes: 16 additions & 17 deletions projects/start-sdk/lib/util/fileHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,11 @@ class FileHelperImpl<A> implements FileHelper<A> {
return null
}

/** Renders to the file format. A key whose value is `undefined` is dropped, so
* merging `undefined` removes it rather than serializing the word. */
private serialize(data: A): string {
return this.writeData(filterUndefined(data))
}

/**
* Accepts structured data and overwrites the existing file on disk.
*/
private async writeFile(data: A): Promise<null> {
return await this.writeFileRaw(this.serialize(data))
return await this.writeFileRaw(this.writeData(data))
}

private async readFileRaw(): Promise<string | null> {
Expand Down Expand Up @@ -414,7 +408,7 @@ class FileHelperImpl<A> implements FileHelper<A> {
fileData = this.validate(fileData)
} catch (_) {}
const mergeData = this.validate(fileMerge({}, fileData, data))
const toWrite = this.serialize(mergeData)
const toWrite = this.writeData(mergeData)
if (toWrite !== fileDataRaw) {
await this.writeFile(mergeData)
if (!options.allowWriteAfterConst && effects.constRetry) {
Expand Down Expand Up @@ -451,14 +445,14 @@ function rawTransformed<A extends Transformed, Raw, Transformed>(
validate: (data: Transformed) => A,
transformers: Transformers<Raw, Transformed, A> | undefined,
): FileHelper<A> {
return FileHelper.raw<A>(
path,
inData => {
if (transformers) {
return toFile(transformers.onWrite(inData))
}
return toFile(inData as any as Raw)
},
return new FileHelperImpl<A>(
toPath(path),
inData =>
toFile(
filterUndefined(
transformers ? transformers.onWrite(inData) : (inData as any as Raw),
),
),
fileData => {
if (transformers) {
return transformers.onRead(fromFile(fileData))
Expand Down Expand Up @@ -585,7 +579,12 @@ export const FileHelper: FileHelperStatic = {
fromFile: (rawData: string) => unknown,
validate: (data: unknown) => A,
): FileHelper<A> {
return new FileHelperImpl<A>(toPath(path), toFile, fromFile, validate)
return new FileHelperImpl<A>(
toPath(path),
inData => toFile(filterUndefined(inData)),
fromFile,
validate,
)
},

string<A extends Transformed, Transformed = string>(
Expand Down
Loading