-
Notifications
You must be signed in to change notification settings - Fork 2
fix: primitives and expected headers #308
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| import { | ||
| ConstrainedMetaModel, | ||
| ConstrainedStringModel, | ||
| ConstrainedIntegerModel, | ||
| ConstrainedFloatModel, | ||
| ConstrainedBooleanModel, | ||
| ConstrainedArrayModel | ||
| } from '@asyncapi/modelina'; | ||
| import {TypeScriptRenderer} from '@asyncapi/modelina/lib/types/generators/typescript/TypeScriptRenderer'; | ||
| import { | ||
| BaseGeneratorContext, | ||
| generateTypescriptValidationCode | ||
| } from './validation'; | ||
|
|
||
| /** | ||
| * Configuration options for the primitives preset | ||
| */ | ||
| export interface PrimitivesPresetOptions { | ||
| /** Whether to include validation methods in generated primitive types */ | ||
| includeValidation: boolean; | ||
| } | ||
|
|
||
| /** | ||
| * Check if the model is a primitive type (string, integer, float, boolean) | ||
| */ | ||
| function isPrimitiveModel(model: ConstrainedMetaModel): boolean { | ||
| return ( | ||
| model instanceof ConstrainedStringModel || | ||
| model instanceof ConstrainedIntegerModel || | ||
| model instanceof ConstrainedFloatModel || | ||
| model instanceof ConstrainedBooleanModel | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Render marshal function for primitive types | ||
| */ | ||
| function renderPrimitiveMarshal(model: ConstrainedMetaModel): string { | ||
| return `export function marshal(payload: ${model.name}): string { | ||
| return JSON.stringify(payload); | ||
| }`; | ||
| } | ||
|
|
||
| /** | ||
| * Render unmarshal function for primitive types | ||
| */ | ||
| function renderPrimitiveUnmarshal(model: ConstrainedMetaModel): string { | ||
| // For string types, the input can be a JSON string (quoted) or the raw value | ||
| // We use 'any' for the json parameter since JSON.parse returns 'any' | ||
| return `export function unmarshal(json: string): ${model.name} { | ||
| return JSON.parse(json) as ${model.name}; | ||
| }`; | ||
| } | ||
|
|
||
| /** | ||
| * Render marshal function for array types | ||
| */ | ||
| function renderArrayMarshal(model: ConstrainedArrayModel): string { | ||
| const valueModel = model.valueModel; | ||
|
|
||
| // Check if array items have a marshal method (object types) | ||
| const hasItemMarshal = | ||
| valueModel.type !== 'string' && | ||
| valueModel.type !== 'number' && | ||
| valueModel.type !== 'boolean'; | ||
|
|
||
| if (hasItemMarshal) { | ||
| return `export function marshal(payload: ${model.name}): string { | ||
| return JSON.stringify(payload.map((item) => { | ||
| if (item && typeof item === 'object' && 'marshal' in item && typeof item.marshal === 'function') { | ||
| return JSON.parse(item.marshal()); | ||
| } | ||
| return item; | ||
| })); | ||
| }`; | ||
| } | ||
|
|
||
| return `export function marshal(payload: ${model.name}): string { | ||
| return JSON.stringify(payload); | ||
| }`; | ||
| } | ||
|
|
||
| /** | ||
| * Render unmarshal function for array types | ||
| */ | ||
| function renderArrayUnmarshal(model: ConstrainedArrayModel): string { | ||
| const valueModel = model.valueModel; | ||
|
|
||
| // Check if array items have an unmarshal method (object types) | ||
| const hasItemUnmarshal = | ||
| valueModel.type !== 'string' && | ||
| valueModel.type !== 'number' && | ||
| valueModel.type !== 'boolean'; | ||
|
|
||
| if (hasItemUnmarshal) { | ||
| const itemTypeName = valueModel.name; | ||
| return `export function unmarshal(json: string | any[]): ${model.name} { | ||
| const arr = typeof json === 'string' ? JSON.parse(json) : json; | ||
| return arr.map((item: any) => { | ||
| if (item && typeof item === 'object') { | ||
| return ${itemTypeName}.unmarshal(item); | ||
| } | ||
| return item; | ||
| }) as ${model.name}; | ||
| }`; | ||
| } | ||
|
|
||
| return `export function unmarshal(json: string | any[]): ${model.name} { | ||
| if (typeof json === 'string') { | ||
| return JSON.parse(json) as ${model.name}; | ||
| } | ||
| return json as ${model.name}; | ||
| }`; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a preset that adds marshalling/unmarshalling and validation methods | ||
| * to primitive types (string, number, boolean) and array types | ||
| * | ||
| * @param options Configuration for primitive generation | ||
| * @param context Generator context containing input type information | ||
| * @returns Modelina preset object with primitive marshalling functionality | ||
| * | ||
| * @example | ||
| * ```typescript | ||
| * const preset = createPrimitivesPreset({ | ||
| * includeValidation: true | ||
| * }, context); | ||
| * ``` | ||
| */ | ||
| export function createPrimitivesPreset( | ||
| options: PrimitivesPresetOptions, | ||
| context: BaseGeneratorContext | ||
| ) { | ||
| return { | ||
| type: { | ||
| self({ | ||
| model, | ||
| content, | ||
| renderer | ||
| }: { | ||
| model: ConstrainedMetaModel; | ||
| content: string; | ||
| renderer: TypeScriptRenderer; | ||
| }) { | ||
| // Handle primitive types (string, integer, float, boolean) | ||
| if (isPrimitiveModel(model)) { | ||
| return `${content} | ||
|
|
||
| ${renderPrimitiveUnmarshal(model)} | ||
| ${renderPrimitiveMarshal(model)} | ||
| ${options.includeValidation ? generateTypescriptValidationCode({model, renderer, asClassMethods: false, context: context as any}) : ''} | ||
| `; | ||
| } | ||
|
|
||
| // Handle array types | ||
| if (model instanceof ConstrainedArrayModel) { | ||
| return `${content} | ||
|
|
||
| ${renderArrayUnmarshal(model)} | ||
| ${renderArrayMarshal(model)} | ||
| ${options.includeValidation ? generateTypescriptValidationCode({model, renderer, asClassMethods: false, context: context as any}) : ''} | ||
| `; | ||
| } | ||
|
|
||
| return content; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.