Skip to content

W-17655986 Ensure Default Boolean Values Are Loaded from Schema #8

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.

Sign up for GitHub

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 5 commits into from
Feb 8, 2025
Merged

W-17655986 Ensure Default Boolean Values Are Loaded from Schema #8

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdd8f3e
Add default value to booleans params
Feb 7, 2025
dc6f30b
0.2.7
Feb 7, 2025
229f29d
chore: update Node.js version to 16 in deployment workflow
Feb 8, 2025
1ee7ca1
chore: update deployment workflow to use matrix strategy for OS
Feb 8, 2025
6ed1825
chore: simplify deployment workflow by removing deprecated OS version
Feb 8, 2025
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
25 changes: 14 additions & 11 deletions src/ApiViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
/**
* @param {ConstructorOptions=} [opts={}]
*/
constructor(opts={}) {
constructor(opts = {}) {
super();
/**
* An array of properties for which view model is to be generated.
Expand Down Expand Up @@ -220,7 +220,7 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
result[result.length] = data;
}
} else if (this._hasType(items, this.ns.aml.vocabularies.shapes.UnionShape)) {
result = this. _modelForUnion(items);
result = this._modelForUnion(items);
}
return result;
}
Expand Down Expand Up @@ -338,6 +338,9 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
if (!this.noDocs) {
schemaItem.description = this._computeDescription(amfItem);
}
if (schemaItem.isBool) {
result.value = schemaItem.defaultValue
}
const valueDelimiter = this._computeValueDelimiter(binding);
const decodeValues = this._computeDecodeValues(binding);
const processOptions = {
Expand Down Expand Up @@ -453,7 +456,7 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
* @param {ProcessOptions=} processOptions
* @return {AmfFormItem[]} View model for items.
*/
modelForRawObject(model, processOptions={}) {
modelForRawObject(model, processOptions = {}) {
const result = [];
const keys = Object.keys(model);
const dataKey = this._getAmfKey(this.ns.raml.vocabularies.data.toString());
Expand Down Expand Up @@ -625,8 +628,8 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
}
if (item.schema.required && typeof item.schema.defaultValue !== 'undefined') {
item.value = item.schema.isArray ?
this._parseArrayExample(/** @type {string} */ (item.schema.defaultValue), processOptions) :
this._exampleAsValue(/** @type {string} */ (item.schema.defaultValue), processOptions);
this._parseArrayExample(/** @type {string} */(item.schema.defaultValue), processOptions) :
this._exampleAsValue(/** @type {string} */(item.schema.defaultValue), processOptions);
}
if (typeof item.value === 'undefined' && item.schema.required) {
const { examples } = item.schema;
Expand Down Expand Up @@ -1181,10 +1184,10 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
_computeInputType(type) {
if (type && NUMBER_INPUT_TYPES.indexOf(type) !== -1) {
return 'number';
}
}
if (type === 'boolean') {
return 'boolean';
}
}
if (type === 'date-only' || type === 'date') {
return 'date';
} /* else if (type === 'time-only' || type === 'time') {
Expand Down Expand Up @@ -1268,7 +1271,7 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
* @param {string=} binding
* @return {AmfFormItem} Generated basic view model.
*/
buildProperty(defaults={
buildProperty(defaults = {
name: undefined,
value: undefined,
enabled: true,
Expand Down Expand Up @@ -1367,7 +1370,7 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
return false;
}
for (let i = 0, len = values.length; i < len; i++) {
const id = this._ensureAmfPrefix(/** @type string */ (this._getValue(values[i], '@id')));
const id = this._ensureAmfPrefix(/** @type string */(this._getValue(values[i], '@id')));
const node = shape[id];
const extensionNameKey = this._getAmfKey(this.ns.aml.vocabularies.core.extensionName);
if (this._getValue(node, extensionNameKey) === 'no-auto-encoding') {
Expand All @@ -1378,8 +1381,8 @@ export class ApiViewModel extends AmfHelperMixin(Object) {
}

/**
*
* @param {string} id
*
* @param {string} id
* @return {string}
*/
_ensureAmfPrefix(id) {
Expand Down
Loading