Skip to content

Commit

Permalink
Fixes some codestyle issues
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikjon committed Mar 26, 2023
1 parent 84d8f5c commit 58a38c1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
10 changes: 4 additions & 6 deletions examples/csharp-generate-records/index.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import {CSHARP_COMMON_PRESET, CSHARP_JSON_SERIALIZER_PRESET, CSharpGenerator} from '../../src';
import { CSharpGenerator } from '../../src';

const generator = new CSharpGenerator({
const generator = new CSharpGenerator({
modelType: 'record',
collectionType: 'List',
collectionType: 'List'
});
const jsonSchemaDraft7 = {
$schema: 'http://json-schema.org/draft-07/schema#',
type: 'object',
additionalProperties: false,
required: [
"name"
],
required: ['name'],
properties: {
email: {
type: 'array',
Expand Down
2 changes: 1 addition & 1 deletion src/generators/csharp/CSharpGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { CSharpPreset, CSHARP_DEFAULT_PRESET } from './CSharpPreset';
import { EnumRenderer } from './renderers/EnumRenderer';
import { ClassRenderer } from './renderers/ClassRenderer';
import { RecordRenderer } from "./renderers/RecordRenderer";
import { RecordRenderer } from './renderers/RecordRenderer';
import { isReservedCSharpKeyword } from './Constants';
import { Logger } from '../../index';
import {
Expand Down
11 changes: 6 additions & 5 deletions src/generators/csharp/CSharpPreset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import {
EnumRenderer
} from './renderers/EnumRenderer';
import {
RecordRenderer,
RecordRenderer,
CSHARP_DEFAULT_RECORD_PRESET
} from "./renderers/RecordRenderer";
} from './renderers/RecordRenderer';

// Our class preset uses custom `accessor` hook to craft getter and setters.
export interface CsharpClassPreset<O> extends ClassPreset<ClassRenderer, O> {
Expand All @@ -28,12 +28,13 @@ export interface CsharpClassPreset<O> extends ClassPreset<ClassRenderer, O> {
) => Promise<string> | string;
}

export interface CsharpRecordPreset<O> extends InterfacePreset<RecordRenderer, O> {
export interface CsharpRecordPreset<O>
extends InterfacePreset<RecordRenderer, O> {
getter?: (
args: PresetArgs<RecordRenderer, O, ConstrainedObjectModel> & PropertyArgs
args: PresetArgs<RecordRenderer, O, ConstrainedObjectModel> & PropertyArgs
) => Promise<string> | string;
setter?: (
args: PresetArgs<RecordRenderer, O, ConstrainedObjectModel> & PropertyArgs
args: PresetArgs<RecordRenderer, O, ConstrainedObjectModel> & PropertyArgs
) => Promise<string> | string;
}

Expand Down
8 changes: 4 additions & 4 deletions src/generators/csharp/renderers/RecordRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@ export const CSHARP_DEFAULT_RECORD_PRESET: CsharpRecordPreset<CSharpOptions> = {
async property({ renderer, property }) {
const getter = await renderer.runGetterPreset(property);
const setter = await renderer.runSetterPreset(property);
return `public ${property.required ? 'required ' : ''}${property.property.type} ${pascalCase(
property.propertyName
)} { ${getter} ${setter} }`;
return `public ${property.required ? 'required ' : ''}${
property.property.type
} ${pascalCase(property.propertyName)} { ${getter} ${setter} }`;
},
getter() {
return 'get;';
},
setter() {
return 'init;';
},
},
additionalContent() {
return '';
}
Expand Down
6 changes: 3 additions & 3 deletions test/generators/csharp/CSharpGenerator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CSharpGenerator } from '../../../src/generators';
describe('CSharpGenerator', () => {
let generator: CSharpGenerator;
beforeEach(() => {
generator = new CSharpGenerator({ modelType: "class"});
generator = new CSharpGenerator({ modelType: 'class' });
});

test('should render `class` type', async () => {
Expand Down Expand Up @@ -46,7 +46,7 @@ describe('CSharpGenerator', () => {
'using System.Collections.Generic;'
]);
});

test('should render `record` type if chosen', async () => {
const doc = {
$id: '_address',
Expand Down Expand Up @@ -80,7 +80,7 @@ describe('CSharpGenerator', () => {
}
};

generator.options.modelType = "record";
generator.options.modelType = 'record';
const models = await generator.generate(doc);
expect(models).toHaveLength(1);
expect(models[0].result).toMatchSnapshot();
Expand Down

0 comments on commit 58a38c1

Please sign in to comment.