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

fix: pattern properties not being accounted for #1006

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d13c267
Fixing dependencies
jonaslagoni Sep 27, 2022
c46e70f
fixed renderer
jonaslagoni Sep 27, 2022
8e6150b
fixed blackbox
jonaslagoni Sep 27, 2022
f103f82
add test
jonaslagoni Sep 27, 2022
dd4ddab
Fixed linter
jonaslagoni Sep 27, 2022
cdaf662
fixed dependencies
jonaslagoni Sep 27, 2022
9bf54a7
Fixed unique implementation
jonaslagoni Sep 27, 2022
6f1d6c6
fixed linter
jonaslagoni Sep 27, 2022
bb673d7
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Sep 27, 2022
c7e8c1d
Merge remote-tracking branch 'origin/feature/fix_python_generator_wit…
jonaslagoni Sep 27, 2022
80af36d
Merge remote-tracking branch 'origin/feature/fix_self_dependencies' i…
jonaslagoni Sep 27, 2022
c475eee
WIP
jonaslagoni Sep 28, 2022
fff0d08
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Oct 3, 2022
e57f7c5
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Oct 4, 2022
e31e2bc
Fixed implementation and test
jonaslagoni Oct 5, 2022
c1ccf69
add fix and implementation
jonaslagoni Oct 5, 2022
a7d7649
update snapshot
jonaslagoni Oct 5, 2022
061a31b
wip
jonaslagoni Oct 4, 2022
cca613a
Merge remote-tracking branch 'origin/feature/fix_typescript_array_typ…
jonaslagoni Oct 5, 2022
a9dce75
Merge remote-tracking branch 'origin/feature/fix_javascript_splits_ou…
jonaslagoni Oct 5, 2022
4c7e6c3
add implementation and test
jonaslagoni Oct 5, 2022
aed9512
fixed linter
jonaslagoni Oct 6, 2022
921da11
Merge remote-tracking branch 'origin/feature/fix_java_maps_cannot_hav…
jonaslagoni Oct 6, 2022
89a94e0
wip
jonaslagoni Oct 17, 2022
35239a2
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Nov 9, 2022
61aec5f
fixed rest of the problems
jonaslagoni Nov 10, 2022
a3ba013
removed unused test file
jonaslagoni Nov 10, 2022
7c2501f
fixed lint
jonaslagoni Nov 10, 2022
5395956
separated blackbox tests and scripts
jonaslagoni Nov 10, 2022
cf0d339
re-added files
jonaslagoni Nov 10, 2022
40e965c
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Nov 10, 2022
2c4de23
updated packagelock
jonaslagoni Nov 10, 2022
7911d28
rename
jonaslagoni Nov 10, 2022
71001e6
fixed linter
jonaslagoni Nov 10, 2022
92bac61
fixed more problems
jonaslagoni Nov 15, 2022
3fe7b78
wip
jonaslagoni Nov 17, 2022
74e7b87
Merge branch 'next' into feature/fix_all_blackbox_tests
jonaslagoni Nov 17, 2022
1fb9f15
update
jonaslagoni Nov 17, 2022
19fa426
renamed parameter
jonaslagoni Nov 17, 2022
8ff1ade
fixed incorrect test scripts was run
jonaslagoni Nov 17, 2022
2114dd2
removed unused file
jonaslagoni Nov 18, 2022
1792c05
added comments
jonaslagoni Nov 23, 2022
24e2651
fixed tests and implementation
jonaslagoni Nov 23, 2022
c6abd12
Merge branch 'next' into feature/fix_pattern_properties_problem
jonaslagoni Nov 23, 2022
af13a3c
removed unneccessary newline
jonaslagoni Nov 23, 2022
30da8fd
Merge branch 'feature/fix_pattern_properties_problem' into feature/fi…
jonaslagoni Nov 23, 2022
c7efd32
Revert "Merge branch 'feature/fix_pattern_properties_problem' into fe…
jonaslagoni Nov 23, 2022
cab7de9
Merge branch 'feature/fix_all_blackbox_tests' into feature/fix_patter…
jonaslagoni Nov 23, 2022
f69c212
fix common model conversion
jonaslagoni Nov 23, 2022
9c2ec21
Merge branch 'next' into feature/fix_pattern_properties_problem
jonaslagoni Nov 29, 2022
903ab1e
add wrong merges
jonaslagoni Nov 29, 2022
b1edfe4
fixed model implementation
jonaslagoni Nov 29, 2022
3d649ea
fixed test
jonaslagoni Nov 29, 2022
de6419c
update snapshots
jonaslagoni Nov 29, 2022
4d28554
update test and implementation
jonaslagoni Nov 29, 2022
397eeeb
update snapshots
jonaslagoni Nov 30, 2022
0c8893a
fixed tests and implementation
jonaslagoni Nov 30, 2022
2989917
fixed lint
jonaslagoni Nov 30, 2022
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
Prev Previous commit
Next Next commit
Fixed implementation and test
  • Loading branch information
jonaslagoni committed Oct 5, 2022
commit e31e2bcc726dbd80c332cc454155410c80af48f4
1 change: 0 additions & 1 deletion src/generators/javascript/JavaScriptGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ ${modelCode}`;
splitMetaModel(model: MetaModel): MetaModel[] {
//These are the models that we have separate renderers for
const metaModelsToSplit = {
splitEnum: true,
splitObject: true
};
return split(model, metaModelsToSplit);
Expand Down
16 changes: 16 additions & 0 deletions test/generators/javascript/JavaScriptGenerator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ describe('JavaScriptGenerator', () => {
expect(models[0].result).toMatchSnapshot();
expect(models[0].dependencies).toEqual([]);
});

test('should not render enums type', async () => {
const doc = {
$id: 'Address',
type: 'object',
properties: {
enum: { type: 'string', enum: ['test', 'test2'] },
},
};

const models = await generator.generate(doc);
expect(models).toHaveLength(1);
expect(models[0].result).toMatchSnapshot();
expect(models[0].dependencies).toEqual([]);
});

test('should render `class` type', async () => {
const doc = {
$id: 'Address',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,28 @@ exports[`JavaScriptGenerator should not render \`class\` with reserved keyword 1
}"
`;

exports[`JavaScriptGenerator should not render enums type 1`] = `
"class Address {
reservedEnum;
additionalProperties;

constructor(input) {
if (input.hasOwnProperty('reservedEnum')) {
this.reservedEnum = input.reservedEnum;
}
if (input.hasOwnProperty('additionalProperties')) {
this.additionalProperties = input.additionalProperties;
}
}

get reservedEnum() { return this.reservedEnum; }
set reservedEnum(reservedEnum) { this.reservedEnum = reservedEnum; }

get additionalProperties() { return this.additionalProperties; }
set additionalProperties(additionalProperties) { this.additionalProperties = additionalProperties; }
}"
`;

exports[`JavaScriptGenerator should render \`class\` type 1`] = `
"class Address {
streetName;
Expand Down