diff --git a/modelerfour/modeler/modelerfour.ts b/modelerfour/modeler/modelerfour.ts index 8ff2f6a..cd6f87b 100644 --- a/modelerfour/modeler/modelerfour.ts +++ b/modelerfour/modeler/modelerfour.ts @@ -407,7 +407,7 @@ export class ModelerFour { apiVersions: this.interpret.getApiVersions(schema), example: this.interpret.getExample(schema), externalDocs: this.interpret.getExternalDocs(schema), - nullableItems: itemSchema.instance.nullable, + nullableItems: (schema.items).nullable || itemSchema.instance?.nullable, serialization: this.interpret.getSerialization(schema), maxItems: schema.maxItems ? Number(schema.maxItems) : undefined, minItems: schema.minItems ? Number(schema.minItems) : undefined, @@ -564,7 +564,7 @@ export class ModelerFour { if (ei && this.interpret.isEmptyObject(ei)) { elementSchema = this.anySchema; } else { - elementNullable = (ei && ei.nullable) || false; + elementNullable = (schema.additionalProperties)["nullable"] || (ei && ei.nullable) || undefined; elementSchema = this.processSchema(eschema.name || '', eschema.instance); } } @@ -1109,6 +1109,7 @@ export class ModelerFour { }, implementation: ImplementationLocation.Method, required: true, + nullable: requestSchema?.instance?.nullable, clientDefaultValue: this.interpret.getClientDefault(body?.instance || {}, {}) })); @@ -1162,6 +1163,7 @@ export class ModelerFour { pSchema, { extensions: this.interpret.getExtensionProperties(body.instance), required: !!body.instance.required, + nullable: requestSchema?.instance?.nullable, protocol: { http: new HttpParameter(ParameterLocation.Body, { style: kmt, @@ -1576,7 +1578,8 @@ export class ModelerFour { } const rsp = new SchemaResponse(s, { - extensions: this.interpret.getExtensionProperties(response) + extensions: this.interpret.getExtensionProperties(response), + nullable: schema.nullable }); rsp.protocol.http = SetType(HttpResponse, { diff --git a/modelerfour/test/scenarios/a-playground/flattened.yaml b/modelerfour/test/scenarios/a-playground/flattened.yaml index 0b29a82..b467f55 100644 --- a/modelerfour/test/scenarios/a-playground/flattened.yaml +++ b/modelerfour/test/scenarios/a-playground/flattened.yaml @@ -388,7 +388,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/a-playground/grouped.yaml b/modelerfour/test/scenarios/a-playground/grouped.yaml index 0b29a82..b467f55 100644 --- a/modelerfour/test/scenarios/a-playground/grouped.yaml +++ b/modelerfour/test/scenarios/a-playground/grouped.yaml @@ -388,7 +388,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/a-playground/modeler.yaml b/modelerfour/test/scenarios/a-playground/modeler.yaml index f9cad84..2261f02 100644 --- a/modelerfour/test/scenarios/a-playground/modeler.yaml +++ b/modelerfour/test/scenarios/a-playground/modeler.yaml @@ -388,7 +388,6 @@ schemas: ! - ! &ref_67 type: dictionary elementType: *ref_12 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/a-playground/namer.yaml b/modelerfour/test/scenarios/a-playground/namer.yaml index 4d36332..4e212dd 100644 --- a/modelerfour/test/scenarios/a-playground/namer.yaml +++ b/modelerfour/test/scenarios/a-playground/namer.yaml @@ -388,7 +388,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: DictionaryWrapperDefaultProgram diff --git a/modelerfour/test/scenarios/additionalProperties/flattened.yaml b/modelerfour/test/scenarios/additionalProperties/flattened.yaml index 43d794c..4440f3c 100644 --- a/modelerfour/test/scenarios/additionalProperties/flattened.yaml +++ b/modelerfour/test/scenarios/additionalProperties/flattened.yaml @@ -145,7 +145,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPString @@ -154,7 +153,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInProperties-additionalProperties @@ -163,7 +161,6 @@ schemas: ! - ! &ref_16 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString @@ -172,7 +169,6 @@ schemas: ! - ! &ref_19 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString-additionalProperties diff --git a/modelerfour/test/scenarios/additionalProperties/grouped.yaml b/modelerfour/test/scenarios/additionalProperties/grouped.yaml index 43d794c..4440f3c 100644 --- a/modelerfour/test/scenarios/additionalProperties/grouped.yaml +++ b/modelerfour/test/scenarios/additionalProperties/grouped.yaml @@ -145,7 +145,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPString @@ -154,7 +153,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInProperties-additionalProperties @@ -163,7 +161,6 @@ schemas: ! - ! &ref_16 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString @@ -172,7 +169,6 @@ schemas: ! - ! &ref_19 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString-additionalProperties diff --git a/modelerfour/test/scenarios/additionalProperties/modeler.yaml b/modelerfour/test/scenarios/additionalProperties/modeler.yaml index 7ad4ea2..1dfc6ed 100644 --- a/modelerfour/test/scenarios/additionalProperties/modeler.yaml +++ b/modelerfour/test/scenarios/additionalProperties/modeler.yaml @@ -145,7 +145,6 @@ schemas: ! - ! &ref_13 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPString @@ -154,7 +153,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInProperties-additionalProperties @@ -163,7 +161,6 @@ schemas: ! - ! &ref_19 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString @@ -172,7 +169,6 @@ schemas: ! - ! &ref_18 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString-additionalProperties diff --git a/modelerfour/test/scenarios/additionalProperties/namer.yaml b/modelerfour/test/scenarios/additionalProperties/namer.yaml index e55c090..47780cd 100644 --- a/modelerfour/test/scenarios/additionalProperties/namer.yaml +++ b/modelerfour/test/scenarios/additionalProperties/namer.yaml @@ -145,7 +145,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPString @@ -154,7 +153,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInPropertiesAdditionalProperties @@ -163,7 +161,6 @@ schemas: ! - ! &ref_16 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPString @@ -172,7 +169,6 @@ schemas: ! - ! &ref_19 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: PetAPInPropertiesWithAPStringAdditionalProperties diff --git a/modelerfour/test/scenarios/advisor/flattened.yaml b/modelerfour/test/scenarios/advisor/flattened.yaml index 3467c74..b21eb8d 100644 --- a/modelerfour/test/scenarios/advisor/flattened.yaml +++ b/modelerfour/test/scenarios/advisor/flattened.yaml @@ -551,7 +551,6 @@ schemas: ! - ! &ref_45 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: RecommendationProperties-extendedProperties diff --git a/modelerfour/test/scenarios/advisor/grouped.yaml b/modelerfour/test/scenarios/advisor/grouped.yaml index 3467c74..b21eb8d 100644 --- a/modelerfour/test/scenarios/advisor/grouped.yaml +++ b/modelerfour/test/scenarios/advisor/grouped.yaml @@ -551,7 +551,6 @@ schemas: ! - ! &ref_45 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: RecommendationProperties-extendedProperties diff --git a/modelerfour/test/scenarios/advisor/modeler.yaml b/modelerfour/test/scenarios/advisor/modeler.yaml index 295c75a..7b10e3c 100644 --- a/modelerfour/test/scenarios/advisor/modeler.yaml +++ b/modelerfour/test/scenarios/advisor/modeler.yaml @@ -551,7 +551,6 @@ schemas: ! - ! &ref_64 type: dictionary elementType: *ref_29 - nullableItems: false language: ! default: name: RecommendationProperties-extendedProperties diff --git a/modelerfour/test/scenarios/advisor/namer.yaml b/modelerfour/test/scenarios/advisor/namer.yaml index d133406..c90abc0 100644 --- a/modelerfour/test/scenarios/advisor/namer.yaml +++ b/modelerfour/test/scenarios/advisor/namer.yaml @@ -551,7 +551,6 @@ schemas: ! - ! &ref_45 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: RecommendationPropertiesExtendedProperties diff --git a/modelerfour/test/scenarios/azure-report/flattened.yaml b/modelerfour/test/scenarios/azure-report/flattened.yaml index d14d565..36503b5 100644 --- a/modelerfour/test/scenarios/azure-report/flattened.yaml +++ b/modelerfour/test/scenarios/azure-report/flattened.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·obr50g·report-azure·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/azure-report/grouped.yaml b/modelerfour/test/scenarios/azure-report/grouped.yaml index d14d565..36503b5 100644 --- a/modelerfour/test/scenarios/azure-report/grouped.yaml +++ b/modelerfour/test/scenarios/azure-report/grouped.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·obr50g·report-azure·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/azure-report/modeler.yaml b/modelerfour/test/scenarios/azure-report/modeler.yaml index 75d17e1..d99b1cd 100644 --- a/modelerfour/test/scenarios/azure-report/modeler.yaml +++ b/modelerfour/test/scenarios/azure-report/modeler.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_6 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·obr50g·report-azure·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/azure-report/namer.yaml b/modelerfour/test/scenarios/azure-report/namer.yaml index a9f3cc3..bab1e6e 100644 --- a/modelerfour/test/scenarios/azure-report/namer.yaml +++ b/modelerfour/test/scenarios/azure-report/namer.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: DictionaryOfInteger diff --git a/modelerfour/test/scenarios/azure-resource-x/flattened.yaml b/modelerfour/test/scenarios/azure-resource-x/flattened.yaml index 402b4c0..cdcbc7e 100644 --- a/modelerfour/test/scenarios/azure-resource-x/flattened.yaml +++ b/modelerfour/test/scenarios/azure-resource-x/flattened.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: ResourceX-tags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource-x/grouped.yaml b/modelerfour/test/scenarios/azure-resource-x/grouped.yaml index 402b4c0..cdcbc7e 100644 --- a/modelerfour/test/scenarios/azure-resource-x/grouped.yaml +++ b/modelerfour/test/scenarios/azure-resource-x/grouped.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: ResourceX-tags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource-x/modeler.yaml b/modelerfour/test/scenarios/azure-resource-x/modeler.yaml index 70c38c1..21b13a3 100644 --- a/modelerfour/test/scenarios/azure-resource-x/modeler.yaml +++ b/modelerfour/test/scenarios/azure-resource-x/modeler.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: ResourceX-tags @@ -250,7 +249,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -259,7 +257,6 @@ schemas: ! - ! &ref_13 type: dictionary elementType: *ref_8 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource-x/namer.yaml b/modelerfour/test/scenarios/azure-resource-x/namer.yaml index 4f2c621..8445e40 100644 --- a/modelerfour/test/scenarios/azure-resource-x/namer.yaml +++ b/modelerfour/test/scenarios/azure-resource-x/namer.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: ResourceXTags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfFlattenedProduct @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollectionDictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource/flattened.yaml b/modelerfour/test/scenarios/azure-resource/flattened.yaml index 7232a8d..a949ca2 100644 --- a/modelerfour/test/scenarios/azure-resource/flattened.yaml +++ b/modelerfour/test/scenarios/azure-resource/flattened.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: Resource-tags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource/grouped.yaml b/modelerfour/test/scenarios/azure-resource/grouped.yaml index 7232a8d..a949ca2 100644 --- a/modelerfour/test/scenarios/azure-resource/grouped.yaml +++ b/modelerfour/test/scenarios/azure-resource/grouped.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: Resource-tags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource/modeler.yaml b/modelerfour/test/scenarios/azure-resource/modeler.yaml index 6813c62..3e43e8c 100644 --- a/modelerfour/test/scenarios/azure-resource/modeler.yaml +++ b/modelerfour/test/scenarios/azure-resource/modeler.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: Resource-tags @@ -250,7 +249,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·lx8sp0·azure-resource_flatten-dictionary·put·requestbody·content·application-json·schema @@ -259,7 +257,6 @@ schemas: ! - ! &ref_13 type: dictionary elementType: *ref_8 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/azure-resource/namer.yaml b/modelerfour/test/scenarios/azure-resource/namer.yaml index 74faec6..08ff9fc 100644 --- a/modelerfour/test/scenarios/azure-resource/namer.yaml +++ b/modelerfour/test/scenarios/azure-resource/namer.yaml @@ -104,7 +104,6 @@ schemas: ! - ! &ref_4 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: ResourceTags @@ -233,7 +232,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfFlattenedProduct @@ -242,7 +240,6 @@ schemas: ! - ! &ref_12 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceCollectionDictionaryofresources diff --git a/modelerfour/test/scenarios/blob-storage/flattened.yaml b/modelerfour/test/scenarios/blob-storage/flattened.yaml index e55f7b6..b40b489 100644 --- a/modelerfour/test/scenarios/blob-storage/flattened.yaml +++ b/modelerfour/test/scenarios/blob-storage/flattened.yaml @@ -7397,7 +7397,6 @@ schemas: ! - ! &ref_42 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ContainerMetadata @@ -7406,7 +7405,6 @@ schemas: ! - ! &ref_90 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: BlobMetadata diff --git a/modelerfour/test/scenarios/blob-storage/grouped.yaml b/modelerfour/test/scenarios/blob-storage/grouped.yaml index e33523a..06a5a2d 100644 --- a/modelerfour/test/scenarios/blob-storage/grouped.yaml +++ b/modelerfour/test/scenarios/blob-storage/grouped.yaml @@ -7397,7 +7397,6 @@ schemas: ! - ! &ref_42 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ContainerMetadata @@ -7406,7 +7405,6 @@ schemas: ! - ! &ref_90 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: BlobMetadata diff --git a/modelerfour/test/scenarios/blob-storage/modeler.yaml b/modelerfour/test/scenarios/blob-storage/modeler.yaml index 5525e1e..c7bb98c 100644 --- a/modelerfour/test/scenarios/blob-storage/modeler.yaml +++ b/modelerfour/test/scenarios/blob-storage/modeler.yaml @@ -7397,7 +7397,6 @@ schemas: ! - ! &ref_131 type: dictionary elementType: *ref_26 - nullableItems: false language: ! default: name: ContainerMetadata @@ -7406,7 +7405,6 @@ schemas: ! - ! &ref_65 type: dictionary elementType: *ref_64 - nullableItems: false language: ! default: name: BlobMetadata diff --git a/modelerfour/test/scenarios/blob-storage/namer.yaml b/modelerfour/test/scenarios/blob-storage/namer.yaml index 99793ac..8d860d7 100644 --- a/modelerfour/test/scenarios/blob-storage/namer.yaml +++ b/modelerfour/test/scenarios/blob-storage/namer.yaml @@ -7397,7 +7397,6 @@ schemas: ! - ! &ref_138 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ContainerMetadata @@ -7406,7 +7405,6 @@ schemas: ! - ! &ref_186 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: BlobMetadata diff --git a/modelerfour/test/scenarios/body-array/flattened.yaml b/modelerfour/test/scenarios/body-array/flattened.yaml index c0ed4d5..5b5cf92 100644 --- a/modelerfour/test/scenarios/body-array/flattened.yaml +++ b/modelerfour/test/scenarios/body-array/flattened.yaml @@ -202,7 +202,6 @@ schemas: ! - ! &ref_25 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: paths·p8a977·array-dictionary-null·get·responses·200·content·application-json·schema·items diff --git a/modelerfour/test/scenarios/body-array/grouped.yaml b/modelerfour/test/scenarios/body-array/grouped.yaml index c0ed4d5..5b5cf92 100644 --- a/modelerfour/test/scenarios/body-array/grouped.yaml +++ b/modelerfour/test/scenarios/body-array/grouped.yaml @@ -202,7 +202,6 @@ schemas: ! - ! &ref_25 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: paths·p8a977·array-dictionary-null·get·responses·200·content·application-json·schema·items diff --git a/modelerfour/test/scenarios/body-array/modeler.yaml b/modelerfour/test/scenarios/body-array/modeler.yaml index fabb117..ae06c12 100644 --- a/modelerfour/test/scenarios/body-array/modeler.yaml +++ b/modelerfour/test/scenarios/body-array/modeler.yaml @@ -202,7 +202,6 @@ schemas: ! - ! &ref_25 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: paths·p8a977·array-dictionary-null·get·responses·200·content·application-json·schema·items diff --git a/modelerfour/test/scenarios/body-array/namer.yaml b/modelerfour/test/scenarios/body-array/namer.yaml index c46b57d..390dee7 100644 --- a/modelerfour/test/scenarios/body-array/namer.yaml +++ b/modelerfour/test/scenarios/body-array/namer.yaml @@ -202,7 +202,6 @@ schemas: ! - ! &ref_25 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: DictionaryOfString diff --git a/modelerfour/test/scenarios/body-complex/flattened.yaml b/modelerfour/test/scenarios/body-complex/flattened.yaml index 5c5a664..b58f1f3 100644 --- a/modelerfour/test/scenarios/body-complex/flattened.yaml +++ b/modelerfour/test/scenarios/body-complex/flattened.yaml @@ -393,7 +393,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/body-complex/grouped.yaml b/modelerfour/test/scenarios/body-complex/grouped.yaml index 5c5a664..b58f1f3 100644 --- a/modelerfour/test/scenarios/body-complex/grouped.yaml +++ b/modelerfour/test/scenarios/body-complex/grouped.yaml @@ -393,7 +393,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/body-complex/modeler.yaml b/modelerfour/test/scenarios/body-complex/modeler.yaml index d1d661c..0975b19 100644 --- a/modelerfour/test/scenarios/body-complex/modeler.yaml +++ b/modelerfour/test/scenarios/body-complex/modeler.yaml @@ -393,7 +393,6 @@ schemas: ! - ! &ref_67 type: dictionary elementType: *ref_12 - nullableItems: false language: ! default: name: dictionary-wrapper-defaultProgram diff --git a/modelerfour/test/scenarios/body-complex/namer.yaml b/modelerfour/test/scenarios/body-complex/namer.yaml index 512b2e6..7fe027e 100644 --- a/modelerfour/test/scenarios/body-complex/namer.yaml +++ b/modelerfour/test/scenarios/body-complex/namer.yaml @@ -393,7 +393,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: DictionaryWrapperDefaultProgram diff --git a/modelerfour/test/scenarios/body-dictionary/flattened.yaml b/modelerfour/test/scenarios/body-dictionary/flattened.yaml index 032e28b..6df8eb1 100644 --- a/modelerfour/test/scenarios/body-dictionary/flattened.yaml +++ b/modelerfour/test/scenarios/body-dictionary/flattened.yaml @@ -129,7 +129,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·fzeo9k·dictionary-null·get·responses·200·content·application-json·schema @@ -138,7 +137,6 @@ schemas: ! - ! &ref_26 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: paths·11jfjdc·dictionary-nullvalue·get·responses·200·content·application-json·schema @@ -147,7 +145,6 @@ schemas: ! - ! &ref_28 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: paths·ylv7la·dictionary-prim-boolean-tfft·get·responses·200·content·application-json·schema @@ -156,7 +153,6 @@ schemas: ! - ! &ref_31 type: dictionary elementType: *ref_3 - nullableItems: false language: ! default: name: paths·1spopx·dictionary-prim-long-1-_1-3-300·get·responses·200·content·application-json·schema @@ -165,7 +161,6 @@ schemas: ! - ! &ref_33 type: dictionary elementType: *ref_4 - nullableItems: false language: ! default: name: paths·1cl7936·dictionary-prim-float-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -174,7 +169,6 @@ schemas: ! - ! &ref_35 type: dictionary elementType: *ref_5 - nullableItems: false language: ! default: name: paths·1g7bjtn·dictionary-prim-double-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -192,7 +186,6 @@ schemas: ! name: date description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·prhgt9·dictionary-prim-date-valid·get·responses·200·content·application-json·schema @@ -211,7 +204,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·mxba4v·dictionary-prim-date_time-valid·get·responses·200·content·application-json·schema @@ -230,7 +222,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·rodv1u·dictionary-prim-date_time_rfc1123-valid·get·responses·200·content·application-json·schema @@ -248,7 +239,6 @@ schemas: ! name: duration description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1gpdne2·dictionary-prim-duration-valid·get·responses·200·content·application-json·schema @@ -267,7 +257,6 @@ schemas: ! name: paths·lgwr7z·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·u6rzbk·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema @@ -286,7 +275,6 @@ schemas: ! name: paths·ul7uf·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1ihizsp·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema @@ -327,7 +315,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·15simd7·dictionary-complex-null·get·responses·200·content·application-json·schema @@ -346,7 +333,6 @@ schemas: ! name: paths·1y9iid6·dictionary-array-null·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·yhrhd1·dictionary-array-null·get·responses·200·content·application-json·schema @@ -365,7 +351,6 @@ schemas: ! name: paths·afa1hv·dictionary-array-empty·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·6cuxrs·dictionary-array-empty·get·responses·200·content·application-json·schema @@ -384,7 +369,6 @@ schemas: ! name: paths·1dxz488·dictionary-array-valid·put·requestbody·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·ax5up1·dictionary-array-valid·put·requestbody·content·application-json·schema diff --git a/modelerfour/test/scenarios/body-dictionary/grouped.yaml b/modelerfour/test/scenarios/body-dictionary/grouped.yaml index 032e28b..6df8eb1 100644 --- a/modelerfour/test/scenarios/body-dictionary/grouped.yaml +++ b/modelerfour/test/scenarios/body-dictionary/grouped.yaml @@ -129,7 +129,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·fzeo9k·dictionary-null·get·responses·200·content·application-json·schema @@ -138,7 +137,6 @@ schemas: ! - ! &ref_26 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: paths·11jfjdc·dictionary-nullvalue·get·responses·200·content·application-json·schema @@ -147,7 +145,6 @@ schemas: ! - ! &ref_28 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: paths·ylv7la·dictionary-prim-boolean-tfft·get·responses·200·content·application-json·schema @@ -156,7 +153,6 @@ schemas: ! - ! &ref_31 type: dictionary elementType: *ref_3 - nullableItems: false language: ! default: name: paths·1spopx·dictionary-prim-long-1-_1-3-300·get·responses·200·content·application-json·schema @@ -165,7 +161,6 @@ schemas: ! - ! &ref_33 type: dictionary elementType: *ref_4 - nullableItems: false language: ! default: name: paths·1cl7936·dictionary-prim-float-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -174,7 +169,6 @@ schemas: ! - ! &ref_35 type: dictionary elementType: *ref_5 - nullableItems: false language: ! default: name: paths·1g7bjtn·dictionary-prim-double-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -192,7 +186,6 @@ schemas: ! name: date description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·prhgt9·dictionary-prim-date-valid·get·responses·200·content·application-json·schema @@ -211,7 +204,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·mxba4v·dictionary-prim-date_time-valid·get·responses·200·content·application-json·schema @@ -230,7 +222,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·rodv1u·dictionary-prim-date_time_rfc1123-valid·get·responses·200·content·application-json·schema @@ -248,7 +239,6 @@ schemas: ! name: duration description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1gpdne2·dictionary-prim-duration-valid·get·responses·200·content·application-json·schema @@ -267,7 +257,6 @@ schemas: ! name: paths·lgwr7z·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·u6rzbk·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema @@ -286,7 +275,6 @@ schemas: ! name: paths·ul7uf·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1ihizsp·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema @@ -327,7 +315,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·15simd7·dictionary-complex-null·get·responses·200·content·application-json·schema @@ -346,7 +333,6 @@ schemas: ! name: paths·1y9iid6·dictionary-array-null·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·yhrhd1·dictionary-array-null·get·responses·200·content·application-json·schema @@ -365,7 +351,6 @@ schemas: ! name: paths·afa1hv·dictionary-array-empty·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·6cuxrs·dictionary-array-empty·get·responses·200·content·application-json·schema @@ -384,7 +369,6 @@ schemas: ! name: paths·1dxz488·dictionary-array-valid·put·requestbody·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·ax5up1·dictionary-array-valid·put·requestbody·content·application-json·schema diff --git a/modelerfour/test/scenarios/body-dictionary/modeler.yaml b/modelerfour/test/scenarios/body-dictionary/modeler.yaml index a7c8f8a..6119536 100644 --- a/modelerfour/test/scenarios/body-dictionary/modeler.yaml +++ b/modelerfour/test/scenarios/body-dictionary/modeler.yaml @@ -129,7 +129,6 @@ schemas: ! - ! &ref_23 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·fzeo9k·dictionary-null·get·responses·200·content·application-json·schema @@ -138,7 +137,6 @@ schemas: ! - ! &ref_26 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: paths·11jfjdc·dictionary-nullvalue·get·responses·200·content·application-json·schema @@ -147,7 +145,6 @@ schemas: ! - ! &ref_28 type: dictionary elementType: *ref_11 - nullableItems: false language: ! default: name: paths·ylv7la·dictionary-prim-boolean-tfft·get·responses·200·content·application-json·schema @@ -156,7 +153,6 @@ schemas: ! - ! &ref_31 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: paths·1spopx·dictionary-prim-long-1-_1-3-300·get·responses·200·content·application-json·schema @@ -165,7 +161,6 @@ schemas: ! - ! &ref_33 type: dictionary elementType: *ref_3 - nullableItems: false language: ! default: name: paths·1cl7936·dictionary-prim-float-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -174,7 +169,6 @@ schemas: ! - ! &ref_35 type: dictionary elementType: *ref_4 - nullableItems: false language: ! default: name: paths·1g7bjtn·dictionary-prim-double-0_0-01_1-2e20·get·responses·200·content·application-json·schema @@ -192,7 +186,6 @@ schemas: ! name: date description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·prhgt9·dictionary-prim-date-valid·get·responses·200·content·application-json·schema @@ -211,7 +204,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·mxba4v·dictionary-prim-date_time-valid·get·responses·200·content·application-json·schema @@ -230,7 +222,6 @@ schemas: ! name: date-time description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·rodv1u·dictionary-prim-date_time_rfc1123-valid·get·responses·200·content·application-json·schema @@ -248,7 +239,6 @@ schemas: ! name: duration description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1gpdne2·dictionary-prim-duration-valid·get·responses·200·content·application-json·schema @@ -267,7 +257,6 @@ schemas: ! name: paths·lgwr7z·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·u6rzbk·dictionary-prim-byte-valid·get·responses·200·content·application-json·schema @@ -286,7 +275,6 @@ schemas: ! name: paths·ul7uf·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1ihizsp·dictionary-prim-base64url-valid·get·responses·200·content·application-json·schema @@ -327,7 +315,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·15simd7·dictionary-complex-null·get·responses·200·content·application-json·schema @@ -346,7 +333,6 @@ schemas: ! name: paths·1y9iid6·dictionary-array-null·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·yhrhd1·dictionary-array-null·get·responses·200·content·application-json·schema @@ -365,7 +351,6 @@ schemas: ! name: paths·afa1hv·dictionary-array-empty·get·responses·200·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·6cuxrs·dictionary-array-empty·get·responses·200·content·application-json·schema @@ -384,7 +369,6 @@ schemas: ! name: paths·1dxz488·dictionary-array-valid·put·requestbody·content·application-json·schema·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·ax5up1·dictionary-array-valid·put·requestbody·content·application-json·schema diff --git a/modelerfour/test/scenarios/body-dictionary/namer.yaml b/modelerfour/test/scenarios/body-dictionary/namer.yaml index a0ea946..bf49b9b 100644 --- a/modelerfour/test/scenarios/body-dictionary/namer.yaml +++ b/modelerfour/test/scenarios/body-dictionary/namer.yaml @@ -129,7 +129,6 @@ schemas: ! - ! &ref_24 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: DictionaryOfInteger @@ -138,7 +137,6 @@ schemas: ! - ! &ref_26 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: DictionaryOfString @@ -147,7 +145,6 @@ schemas: ! - ! &ref_28 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: DictionaryOfBoolean @@ -156,7 +153,6 @@ schemas: ! - ! &ref_31 type: dictionary elementType: *ref_3 - nullableItems: false language: ! default: name: DictionaryOfInteger @@ -165,7 +161,6 @@ schemas: ! - ! &ref_33 type: dictionary elementType: *ref_4 - nullableItems: false language: ! default: name: DictionaryOfNumber @@ -174,7 +169,6 @@ schemas: ! - ! &ref_35 type: dictionary elementType: *ref_5 - nullableItems: false language: ! default: name: DictionaryOfNumber @@ -192,7 +186,6 @@ schemas: ! name: Date description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfDate @@ -211,7 +204,6 @@ schemas: ! name: DateTime description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfDateTime @@ -230,7 +222,6 @@ schemas: ! name: DateTime description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfDateTime @@ -248,7 +239,6 @@ schemas: ! name: Duration description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfDuration @@ -267,7 +257,6 @@ schemas: ! name: ByteArray description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfByteArray @@ -286,7 +275,6 @@ schemas: ! name: ByteArray description: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfByteArray @@ -327,7 +315,6 @@ schemas: ! description: '' namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfWidget @@ -346,7 +333,6 @@ schemas: ! name: ArrayOfGet200ApplicationJsonAdditionalPropertiesItem description: Array of Get200ApplicationJsonAdditionalPropertiesItem protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfpaths1Y9Iid6DictionaryArrayNullGetResponses200ContentApplicationJsonSchemaAdditionalproperties @@ -365,7 +351,6 @@ schemas: ! name: ArrayOfString description: Array of String protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfpathsAfa1HvDictionaryArrayEmptyGetResponses200ContentApplicationJsonSchemaAdditionalproperties @@ -384,7 +369,6 @@ schemas: ! name: ArrayOfPutContentSchemaItemsItem description: Array of PutContentSchemaItemsItem protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfpaths1Dxz488DictionaryArrayValidPutRequestbodyContentApplicationJsonSchemaAdditionalproperties diff --git a/modelerfour/test/scenarios/cognitive-search/flattened.yaml b/modelerfour/test/scenarios/cognitive-search/flattened.yaml index f61702e..9294a51 100644 --- a/modelerfour/test/scenarios/cognitive-search/flattened.yaml +++ b/modelerfour/test/scenarios/cognitive-search/flattened.yaml @@ -817,7 +817,6 @@ schemas: ! name: components·1039crn·schemas·documentsearchresult·properties·search-facets·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Facets @@ -844,7 +843,6 @@ schemas: ! name: components·1fouik0·schemas·searchresult·properties·search-highlights·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Highlights diff --git a/modelerfour/test/scenarios/cognitive-search/grouped.yaml b/modelerfour/test/scenarios/cognitive-search/grouped.yaml index 1e104a8..0a72992 100644 --- a/modelerfour/test/scenarios/cognitive-search/grouped.yaml +++ b/modelerfour/test/scenarios/cognitive-search/grouped.yaml @@ -817,7 +817,6 @@ schemas: ! name: components·1039crn·schemas·documentsearchresult·properties·search-facets·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Facets @@ -844,7 +843,6 @@ schemas: ! name: components·1fouik0·schemas·searchresult·properties·search-highlights·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Highlights diff --git a/modelerfour/test/scenarios/cognitive-search/modeler.yaml b/modelerfour/test/scenarios/cognitive-search/modeler.yaml index 000594e..1a1edbf 100644 --- a/modelerfour/test/scenarios/cognitive-search/modeler.yaml +++ b/modelerfour/test/scenarios/cognitive-search/modeler.yaml @@ -817,7 +817,6 @@ schemas: ! name: components·1039crn·schemas·documentsearchresult·properties·search-facets·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Facets @@ -844,7 +843,6 @@ schemas: ! name: components·1fouik0·schemas·searchresult·properties·search-highlights·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: Highlights diff --git a/modelerfour/test/scenarios/cognitive-search/namer.yaml b/modelerfour/test/scenarios/cognitive-search/namer.yaml index b79c3a7..c85c9b6 100644 --- a/modelerfour/test/scenarios/cognitive-search/namer.yaml +++ b/modelerfour/test/scenarios/cognitive-search/namer.yaml @@ -817,7 +817,6 @@ schemas: ! name: ArrayOfFacetResult description: Array of FacetResult protocol: ! {} - nullableItems: false language: ! default: name: Facets @@ -844,7 +843,6 @@ schemas: ! name: ArrayOfSearchResultSearchHighlightsItemsItem description: Array of SearchResultSearchHighlightsItemsItem protocol: ! {} - nullableItems: false language: ! default: name: Highlights diff --git a/modelerfour/test/scenarios/complex-model/flattened.yaml b/modelerfour/test/scenarios/complex-model/flattened.yaml index cf4ad5f..6914adc 100644 --- a/modelerfour/test/scenarios/complex-model/flattened.yaml +++ b/modelerfour/test/scenarios/complex-model/flattened.yaml @@ -182,7 +182,6 @@ schemas: ! name: components·5px1as·schemas·catalogdictionaryofarray·properties·productdictionaryofarray·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: CatalogDictionaryOfArray-productDictionaryOfArray @@ -191,7 +190,6 @@ schemas: ! - ! &ref_10 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogDictionary-productDictionary @@ -200,7 +198,6 @@ schemas: ! - ! &ref_11 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogArrayOfDictionary-productArrayOfDictionaryItem diff --git a/modelerfour/test/scenarios/complex-model/grouped.yaml b/modelerfour/test/scenarios/complex-model/grouped.yaml index cf4ad5f..6914adc 100644 --- a/modelerfour/test/scenarios/complex-model/grouped.yaml +++ b/modelerfour/test/scenarios/complex-model/grouped.yaml @@ -182,7 +182,6 @@ schemas: ! name: components·5px1as·schemas·catalogdictionaryofarray·properties·productdictionaryofarray·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: CatalogDictionaryOfArray-productDictionaryOfArray @@ -191,7 +190,6 @@ schemas: ! - ! &ref_10 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogDictionary-productDictionary @@ -200,7 +198,6 @@ schemas: ! - ! &ref_11 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogArrayOfDictionary-productArrayOfDictionaryItem diff --git a/modelerfour/test/scenarios/complex-model/modeler.yaml b/modelerfour/test/scenarios/complex-model/modeler.yaml index 3c1cadf..6bdd1ba 100644 --- a/modelerfour/test/scenarios/complex-model/modeler.yaml +++ b/modelerfour/test/scenarios/complex-model/modeler.yaml @@ -182,7 +182,6 @@ schemas: ! name: components·5px1as·schemas·catalogdictionaryofarray·properties·productdictionaryofarray·additionalproperties description: '' protocol: ! {} - nullableItems: false language: ! default: name: CatalogDictionaryOfArray-productDictionaryOfArray @@ -191,7 +190,6 @@ schemas: ! - ! &ref_13 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogDictionary-productDictionary @@ -200,7 +198,6 @@ schemas: ! - ! &ref_14 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogArrayOfDictionary-productArrayOfDictionaryItem diff --git a/modelerfour/test/scenarios/complex-model/namer.yaml b/modelerfour/test/scenarios/complex-model/namer.yaml index 3f90e91..c83c159 100644 --- a/modelerfour/test/scenarios/complex-model/namer.yaml +++ b/modelerfour/test/scenarios/complex-model/namer.yaml @@ -182,7 +182,6 @@ schemas: ! name: ArrayOfProduct description: Array of Product protocol: ! {} - nullableItems: false language: ! default: name: CatalogDictionaryOfArrayProductDictionaryOfArray @@ -191,7 +190,6 @@ schemas: ! - ! &ref_10 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogDictionaryProductDictionary @@ -200,7 +198,6 @@ schemas: ! - ! &ref_11 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CatalogArrayOfDictionaryProductArrayOfDictionaryItem diff --git a/modelerfour/test/scenarios/keyvault/flattened.yaml b/modelerfour/test/scenarios/keyvault/flattened.yaml index 2e26313..1793a86 100644 --- a/modelerfour/test/scenarios/keyvault/flattened.yaml +++ b/modelerfour/test/scenarios/keyvault/flattened.yaml @@ -1557,7 +1557,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyCreateParameters-tags @@ -1566,7 +1565,6 @@ schemas: ! - ! &ref_36 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyBundle-tags @@ -1575,7 +1573,6 @@ schemas: ! - ! &ref_43 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyImportParameters-tags @@ -1584,7 +1581,6 @@ schemas: ! - ! &ref_44 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyUpdateParameters-tags @@ -1593,7 +1589,6 @@ schemas: ! - ! &ref_49 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyItem-tags @@ -1602,7 +1597,6 @@ schemas: ! - ! &ref_64 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretSetParameters-tags @@ -1611,7 +1605,6 @@ schemas: ! - ! &ref_74 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretBundle-tags @@ -1620,7 +1613,6 @@ schemas: ! - ! &ref_78 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretUpdateParameters-tags @@ -1629,7 +1621,6 @@ schemas: ! - ! &ref_83 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretItem-tags @@ -1638,7 +1629,6 @@ schemas: ! - ! &ref_96 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateItem-tags @@ -1647,7 +1637,6 @@ schemas: ! - ! &ref_122 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateBundle-tags @@ -1656,7 +1645,6 @@ schemas: ! - ! &ref_158 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateCreateParameters-tags @@ -1665,7 +1653,6 @@ schemas: ! - ! &ref_168 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateImportParameters-tags @@ -1674,7 +1661,6 @@ schemas: ! - ! &ref_169 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateUpdateParameters-tags @@ -1683,7 +1669,6 @@ schemas: ! - ! &ref_171 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateMergeParameters-tags @@ -1692,7 +1677,6 @@ schemas: ! - ! &ref_183 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountItem-tags @@ -1701,7 +1685,6 @@ schemas: ! - ! &ref_193 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageBundle-tags @@ -1710,7 +1693,6 @@ schemas: ! - ! &ref_201 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountCreateParameters-tags @@ -1719,7 +1701,6 @@ schemas: ! - ! &ref_204 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountUpdateParameters-tags @@ -1728,7 +1709,6 @@ schemas: ! - ! &ref_213 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionItem-tags @@ -1737,7 +1717,6 @@ schemas: ! - ! &ref_223 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionBundle-tags @@ -1746,7 +1725,6 @@ schemas: ! - ! &ref_228 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionCreateParameters-tags @@ -1755,7 +1733,6 @@ schemas: ! - ! &ref_231 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionUpdateParameters-tags diff --git a/modelerfour/test/scenarios/keyvault/grouped.yaml b/modelerfour/test/scenarios/keyvault/grouped.yaml index 2e26313..1793a86 100644 --- a/modelerfour/test/scenarios/keyvault/grouped.yaml +++ b/modelerfour/test/scenarios/keyvault/grouped.yaml @@ -1557,7 +1557,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyCreateParameters-tags @@ -1566,7 +1565,6 @@ schemas: ! - ! &ref_36 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyBundle-tags @@ -1575,7 +1573,6 @@ schemas: ! - ! &ref_43 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyImportParameters-tags @@ -1584,7 +1581,6 @@ schemas: ! - ! &ref_44 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyUpdateParameters-tags @@ -1593,7 +1589,6 @@ schemas: ! - ! &ref_49 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyItem-tags @@ -1602,7 +1597,6 @@ schemas: ! - ! &ref_64 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretSetParameters-tags @@ -1611,7 +1605,6 @@ schemas: ! - ! &ref_74 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretBundle-tags @@ -1620,7 +1613,6 @@ schemas: ! - ! &ref_78 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretUpdateParameters-tags @@ -1629,7 +1621,6 @@ schemas: ! - ! &ref_83 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretItem-tags @@ -1638,7 +1629,6 @@ schemas: ! - ! &ref_96 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateItem-tags @@ -1647,7 +1637,6 @@ schemas: ! - ! &ref_122 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateBundle-tags @@ -1656,7 +1645,6 @@ schemas: ! - ! &ref_158 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateCreateParameters-tags @@ -1665,7 +1653,6 @@ schemas: ! - ! &ref_168 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateImportParameters-tags @@ -1674,7 +1661,6 @@ schemas: ! - ! &ref_169 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateUpdateParameters-tags @@ -1683,7 +1669,6 @@ schemas: ! - ! &ref_171 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateMergeParameters-tags @@ -1692,7 +1677,6 @@ schemas: ! - ! &ref_183 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountItem-tags @@ -1701,7 +1685,6 @@ schemas: ! - ! &ref_193 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageBundle-tags @@ -1710,7 +1693,6 @@ schemas: ! - ! &ref_201 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountCreateParameters-tags @@ -1719,7 +1701,6 @@ schemas: ! - ! &ref_204 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountUpdateParameters-tags @@ -1728,7 +1709,6 @@ schemas: ! - ! &ref_213 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionItem-tags @@ -1737,7 +1717,6 @@ schemas: ! - ! &ref_223 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionBundle-tags @@ -1746,7 +1725,6 @@ schemas: ! - ! &ref_228 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionCreateParameters-tags @@ -1755,7 +1733,6 @@ schemas: ! - ! &ref_231 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionUpdateParameters-tags diff --git a/modelerfour/test/scenarios/keyvault/modeler.yaml b/modelerfour/test/scenarios/keyvault/modeler.yaml index af9aca5..150c537 100644 --- a/modelerfour/test/scenarios/keyvault/modeler.yaml +++ b/modelerfour/test/scenarios/keyvault/modeler.yaml @@ -1557,7 +1557,6 @@ schemas: ! - ! &ref_204 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: KeyCreateParameters-tags @@ -1566,7 +1565,6 @@ schemas: ! - ! &ref_205 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: KeyBundle-tags @@ -1575,7 +1573,6 @@ schemas: ! - ! &ref_206 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: KeyImportParameters-tags @@ -1584,7 +1581,6 @@ schemas: ! - ! &ref_207 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: KeyUpdateParameters-tags @@ -1593,7 +1589,6 @@ schemas: ! - ! &ref_208 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: KeyItem-tags @@ -1602,7 +1597,6 @@ schemas: ! - ! &ref_209 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SecretSetParameters-tags @@ -1611,7 +1605,6 @@ schemas: ! - ! &ref_210 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SecretBundle-tags @@ -1620,7 +1613,6 @@ schemas: ! - ! &ref_211 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SecretUpdateParameters-tags @@ -1629,7 +1621,6 @@ schemas: ! - ! &ref_212 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SecretItem-tags @@ -1638,7 +1629,6 @@ schemas: ! - ! &ref_213 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateItem-tags @@ -1647,7 +1637,6 @@ schemas: ! - ! &ref_214 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateBundle-tags @@ -1656,7 +1645,6 @@ schemas: ! - ! &ref_215 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateCreateParameters-tags @@ -1665,7 +1653,6 @@ schemas: ! - ! &ref_216 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateImportParameters-tags @@ -1674,7 +1661,6 @@ schemas: ! - ! &ref_217 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateUpdateParameters-tags @@ -1683,7 +1669,6 @@ schemas: ! - ! &ref_218 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: CertificateMergeParameters-tags @@ -1692,7 +1677,6 @@ schemas: ! - ! &ref_219 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: StorageAccountItem-tags @@ -1701,7 +1685,6 @@ schemas: ! - ! &ref_220 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: StorageBundle-tags @@ -1710,7 +1693,6 @@ schemas: ! - ! &ref_221 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: StorageAccountCreateParameters-tags @@ -1719,7 +1701,6 @@ schemas: ! - ! &ref_222 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: StorageAccountUpdateParameters-tags @@ -1728,7 +1709,6 @@ schemas: ! - ! &ref_223 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SasDefinitionItem-tags @@ -1737,7 +1717,6 @@ schemas: ! - ! &ref_224 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SasDefinitionBundle-tags @@ -1746,7 +1725,6 @@ schemas: ! - ! &ref_225 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SasDefinitionCreateParameters-tags @@ -1755,7 +1733,6 @@ schemas: ! - ! &ref_226 type: dictionary elementType: *ref_6 - nullableItems: false language: ! default: name: SasDefinitionUpdateParameters-tags diff --git a/modelerfour/test/scenarios/keyvault/namer.yaml b/modelerfour/test/scenarios/keyvault/namer.yaml index 8943d7b..8c358c5 100644 --- a/modelerfour/test/scenarios/keyvault/namer.yaml +++ b/modelerfour/test/scenarios/keyvault/namer.yaml @@ -1557,7 +1557,6 @@ schemas: ! - ! &ref_15 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyCreateParametersTags @@ -1566,7 +1565,6 @@ schemas: ! - ! &ref_36 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyBundleTags @@ -1575,7 +1573,6 @@ schemas: ! - ! &ref_43 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyImportParametersTags @@ -1584,7 +1581,6 @@ schemas: ! - ! &ref_44 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyUpdateParametersTags @@ -1593,7 +1589,6 @@ schemas: ! - ! &ref_49 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: KeyItemTags @@ -1602,7 +1597,6 @@ schemas: ! - ! &ref_64 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretSetParametersTags @@ -1611,7 +1605,6 @@ schemas: ! - ! &ref_74 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretBundleTags @@ -1620,7 +1613,6 @@ schemas: ! - ! &ref_78 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretUpdateParametersTags @@ -1629,7 +1621,6 @@ schemas: ! - ! &ref_83 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SecretItemTags @@ -1638,7 +1629,6 @@ schemas: ! - ! &ref_96 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateItemTags @@ -1647,7 +1637,6 @@ schemas: ! - ! &ref_122 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateBundleTags @@ -1656,7 +1645,6 @@ schemas: ! - ! &ref_158 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateCreateParametersTags @@ -1665,7 +1653,6 @@ schemas: ! - ! &ref_168 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateImportParametersTags @@ -1674,7 +1661,6 @@ schemas: ! - ! &ref_169 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateUpdateParametersTags @@ -1683,7 +1669,6 @@ schemas: ! - ! &ref_171 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: CertificateMergeParametersTags @@ -1692,7 +1677,6 @@ schemas: ! - ! &ref_183 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountItemTags @@ -1701,7 +1685,6 @@ schemas: ! - ! &ref_193 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageBundleTags @@ -1710,7 +1693,6 @@ schemas: ! - ! &ref_201 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountCreateParametersTags @@ -1719,7 +1701,6 @@ schemas: ! - ! &ref_204 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: StorageAccountUpdateParametersTags @@ -1728,7 +1709,6 @@ schemas: ! - ! &ref_213 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionItemTags @@ -1737,7 +1717,6 @@ schemas: ! - ! &ref_223 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionBundleTags @@ -1746,7 +1725,6 @@ schemas: ! - ! &ref_228 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionCreateParametersTags @@ -1755,7 +1733,6 @@ schemas: ! - ! &ref_231 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: SasDefinitionUpdateParametersTags diff --git a/modelerfour/test/scenarios/lro/flattened.yaml b/modelerfour/test/scenarios/lro/flattened.yaml index 554869d..955d560 100644 --- a/modelerfour/test/scenarios/lro/flattened.yaml +++ b/modelerfour/test/scenarios/lro/flattened.yaml @@ -400,7 +400,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/lro/grouped.yaml b/modelerfour/test/scenarios/lro/grouped.yaml index 554869d..955d560 100644 --- a/modelerfour/test/scenarios/lro/grouped.yaml +++ b/modelerfour/test/scenarios/lro/grouped.yaml @@ -400,7 +400,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/lro/modeler.yaml b/modelerfour/test/scenarios/lro/modeler.yaml index 60d537f..f582828 100644 --- a/modelerfour/test/scenarios/lro/modeler.yaml +++ b/modelerfour/test/scenarios/lro/modeler.yaml @@ -400,7 +400,6 @@ schemas: ! - ! &ref_23 type: dictionary elementType: *ref_4 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/lro/namer.yaml b/modelerfour/test/scenarios/lro/namer.yaml index 839703f..a08265d 100644 --- a/modelerfour/test/scenarios/lro/namer.yaml +++ b/modelerfour/test/scenarios/lro/namer.yaml @@ -400,7 +400,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceTags diff --git a/modelerfour/test/scenarios/model-flattening/flattened.yaml b/modelerfour/test/scenarios/model-flattening/flattened.yaml index 4e9d5b7..ea30c7d 100644 --- a/modelerfour/test/scenarios/model-flattening/flattened.yaml +++ b/modelerfour/test/scenarios/model-flattening/flattened.yaml @@ -267,7 +267,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags @@ -406,7 +405,6 @@ schemas: ! description: Flattened product. namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1r824xk·model_flatten-dictionary·put·requestbody·content·application-json·schema @@ -415,7 +413,6 @@ schemas: ! - ! &ref_17 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/model-flattening/grouped.yaml b/modelerfour/test/scenarios/model-flattening/grouped.yaml index dd87bbe..7d58572 100644 --- a/modelerfour/test/scenarios/model-flattening/grouped.yaml +++ b/modelerfour/test/scenarios/model-flattening/grouped.yaml @@ -267,7 +267,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags @@ -406,7 +405,6 @@ schemas: ! description: Flattened product. namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1r824xk·model_flatten-dictionary·put·requestbody·content·application-json·schema @@ -415,7 +413,6 @@ schemas: ! - ! &ref_17 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/model-flattening/modeler.yaml b/modelerfour/test/scenarios/model-flattening/modeler.yaml index 08da218..f6a9d31 100644 --- a/modelerfour/test/scenarios/model-flattening/modeler.yaml +++ b/modelerfour/test/scenarios/model-flattening/modeler.yaml @@ -267,7 +267,6 @@ schemas: ! - ! &ref_26 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: Resource-tags @@ -422,7 +421,6 @@ schemas: ! description: Flattened product. namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: paths·1r824xk·model_flatten-dictionary·put·requestbody·content·application-json·schema @@ -431,7 +429,6 @@ schemas: ! - ! &ref_27 type: dictionary elementType: *ref_10 - nullableItems: false language: ! default: name: ResourceCollection-dictionaryofresources diff --git a/modelerfour/test/scenarios/model-flattening/namer.yaml b/modelerfour/test/scenarios/model-flattening/namer.yaml index 0b2f58e..5274b20 100644 --- a/modelerfour/test/scenarios/model-flattening/namer.yaml +++ b/modelerfour/test/scenarios/model-flattening/namer.yaml @@ -267,7 +267,6 @@ schemas: ! - ! &ref_5 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceTags @@ -406,7 +405,6 @@ schemas: ! description: Flattened product. namespace: '' protocol: ! {} - nullableItems: false language: ! default: name: DictionaryOfFlattenedProduct @@ -415,7 +413,6 @@ schemas: ! - ! &ref_33 type: dictionary elementType: *ref_2 - nullableItems: false language: ! default: name: ResourceCollectionDictionaryofresources diff --git a/modelerfour/test/scenarios/parameter-flattening/flattened.yaml b/modelerfour/test/scenarios/parameter-flattening/flattened.yaml index 9ec761f..303eba6 100644 --- a/modelerfour/test/scenarios/parameter-flattening/flattened.yaml +++ b/modelerfour/test/scenarios/parameter-flattening/flattened.yaml @@ -36,7 +36,6 @@ schemas: ! - ! &ref_1 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: AvailabilitySetUpdateParameters-tags diff --git a/modelerfour/test/scenarios/parameter-flattening/grouped.yaml b/modelerfour/test/scenarios/parameter-flattening/grouped.yaml index 9ec761f..303eba6 100644 --- a/modelerfour/test/scenarios/parameter-flattening/grouped.yaml +++ b/modelerfour/test/scenarios/parameter-flattening/grouped.yaml @@ -36,7 +36,6 @@ schemas: ! - ! &ref_1 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: AvailabilitySetUpdateParameters-tags diff --git a/modelerfour/test/scenarios/parameter-flattening/modeler.yaml b/modelerfour/test/scenarios/parameter-flattening/modeler.yaml index 39ba968..9de5b8f 100644 --- a/modelerfour/test/scenarios/parameter-flattening/modeler.yaml +++ b/modelerfour/test/scenarios/parameter-flattening/modeler.yaml @@ -36,7 +36,6 @@ schemas: ! - ! &ref_1 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: AvailabilitySetUpdateParameters-tags diff --git a/modelerfour/test/scenarios/parameter-flattening/namer.yaml b/modelerfour/test/scenarios/parameter-flattening/namer.yaml index 7062f3d..bac8007 100644 --- a/modelerfour/test/scenarios/parameter-flattening/namer.yaml +++ b/modelerfour/test/scenarios/parameter-flattening/namer.yaml @@ -36,7 +36,6 @@ schemas: ! - ! &ref_1 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: AvailabilitySetUpdateParametersTags diff --git a/modelerfour/test/scenarios/report/flattened.yaml b/modelerfour/test/scenarios/report/flattened.yaml index ca3c944..6d5d201 100644 --- a/modelerfour/test/scenarios/report/flattened.yaml +++ b/modelerfour/test/scenarios/report/flattened.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·ifo91j·report·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/report/grouped.yaml b/modelerfour/test/scenarios/report/grouped.yaml index ca3c944..6d5d201 100644 --- a/modelerfour/test/scenarios/report/grouped.yaml +++ b/modelerfour/test/scenarios/report/grouped.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·ifo91j·report·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/report/modeler.yaml b/modelerfour/test/scenarios/report/modeler.yaml index 72ed491..7382468 100644 --- a/modelerfour/test/scenarios/report/modeler.yaml +++ b/modelerfour/test/scenarios/report/modeler.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_6 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: paths·ifo91j·report·get·responses·200·content·application-json·schema diff --git a/modelerfour/test/scenarios/report/namer.yaml b/modelerfour/test/scenarios/report/namer.yaml index efe322d..04689e3 100644 --- a/modelerfour/test/scenarios/report/namer.yaml +++ b/modelerfour/test/scenarios/report/namer.yaml @@ -55,7 +55,6 @@ schemas: ! - ! &ref_7 type: dictionary elementType: *ref_0 - nullableItems: false language: ! default: name: DictionaryOfInteger diff --git a/modelerfour/test/scenarios/storage/flattened.yaml b/modelerfour/test/scenarios/storage/flattened.yaml index 3a820a7..595ac18 100644 --- a/modelerfour/test/scenarios/storage/flattened.yaml +++ b/modelerfour/test/scenarios/storage/flattened.yaml @@ -441,7 +441,6 @@ schemas: ! - ! &ref_29 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/storage/grouped.yaml b/modelerfour/test/scenarios/storage/grouped.yaml index 3a820a7..595ac18 100644 --- a/modelerfour/test/scenarios/storage/grouped.yaml +++ b/modelerfour/test/scenarios/storage/grouped.yaml @@ -441,7 +441,6 @@ schemas: ! - ! &ref_29 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/storage/modeler.yaml b/modelerfour/test/scenarios/storage/modeler.yaml index 2baa7d8..eb182ed 100644 --- a/modelerfour/test/scenarios/storage/modeler.yaml +++ b/modelerfour/test/scenarios/storage/modeler.yaml @@ -441,7 +441,6 @@ schemas: ! - ! &ref_41 type: dictionary elementType: *ref_8 - nullableItems: false language: ! default: name: Resource-tags diff --git a/modelerfour/test/scenarios/storage/namer.yaml b/modelerfour/test/scenarios/storage/namer.yaml index 7bb1f42..60ab580 100644 --- a/modelerfour/test/scenarios/storage/namer.yaml +++ b/modelerfour/test/scenarios/storage/namer.yaml @@ -441,7 +441,6 @@ schemas: ! - ! &ref_29 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: ResourceTags diff --git a/modelerfour/test/scenarios/text-analytics/flattened.yaml b/modelerfour/test/scenarios/text-analytics/flattened.yaml index c86df0d..20beb1c 100644 --- a/modelerfour/test/scenarios/text-analytics/flattened.yaml +++ b/modelerfour/test/scenarios/text-analytics/flattened.yaml @@ -681,7 +681,6 @@ schemas: ! - ! &ref_21 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: InnerError-details diff --git a/modelerfour/test/scenarios/text-analytics/grouped.yaml b/modelerfour/test/scenarios/text-analytics/grouped.yaml index c86df0d..20beb1c 100644 --- a/modelerfour/test/scenarios/text-analytics/grouped.yaml +++ b/modelerfour/test/scenarios/text-analytics/grouped.yaml @@ -681,7 +681,6 @@ schemas: ! - ! &ref_21 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: InnerError-details diff --git a/modelerfour/test/scenarios/text-analytics/modeler.yaml b/modelerfour/test/scenarios/text-analytics/modeler.yaml index 834ae4c..d552e9d 100644 --- a/modelerfour/test/scenarios/text-analytics/modeler.yaml +++ b/modelerfour/test/scenarios/text-analytics/modeler.yaml @@ -681,7 +681,6 @@ schemas: ! - ! &ref_94 type: dictionary elementType: *ref_13 - nullableItems: false language: ! default: name: InnerError-details diff --git a/modelerfour/test/scenarios/text-analytics/namer.yaml b/modelerfour/test/scenarios/text-analytics/namer.yaml index 8605b6d..cc08844 100644 --- a/modelerfour/test/scenarios/text-analytics/namer.yaml +++ b/modelerfour/test/scenarios/text-analytics/namer.yaml @@ -681,7 +681,6 @@ schemas: ! - ! &ref_21 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: InnerErrorDetails diff --git a/modelerfour/test/scenarios/xml-service/flattened.yaml b/modelerfour/test/scenarios/xml-service/flattened.yaml index 9b37614..aa48960 100644 --- a/modelerfour/test/scenarios/xml-service/flattened.yaml +++ b/modelerfour/test/scenarios/xml-service/flattened.yaml @@ -1013,7 +1013,6 @@ schemas: ! - ! &ref_32 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Metadata diff --git a/modelerfour/test/scenarios/xml-service/grouped.yaml b/modelerfour/test/scenarios/xml-service/grouped.yaml index 9b37614..aa48960 100644 --- a/modelerfour/test/scenarios/xml-service/grouped.yaml +++ b/modelerfour/test/scenarios/xml-service/grouped.yaml @@ -1013,7 +1013,6 @@ schemas: ! - ! &ref_32 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Metadata diff --git a/modelerfour/test/scenarios/xml-service/modeler.yaml b/modelerfour/test/scenarios/xml-service/modeler.yaml index 521ffbb..f88de86 100644 --- a/modelerfour/test/scenarios/xml-service/modeler.yaml +++ b/modelerfour/test/scenarios/xml-service/modeler.yaml @@ -1013,7 +1013,6 @@ schemas: ! - ! &ref_67 type: dictionary elementType: *ref_25 - nullableItems: false language: ! default: name: Metadata diff --git a/modelerfour/test/scenarios/xml-service/namer.yaml b/modelerfour/test/scenarios/xml-service/namer.yaml index 7b89574..d74af54 100644 --- a/modelerfour/test/scenarios/xml-service/namer.yaml +++ b/modelerfour/test/scenarios/xml-service/namer.yaml @@ -1013,7 +1013,6 @@ schemas: ! - ! &ref_32 type: dictionary elementType: *ref_1 - nullableItems: false language: ! default: name: Metadata diff --git a/modelerfour/test/unit/modelerfour.test.ts b/modelerfour/test/unit/modelerfour.test.ts index 9ed5fd1..b33af6a 100644 --- a/modelerfour/test/unit/modelerfour.test.ts +++ b/modelerfour/test/unit/modelerfour.test.ts @@ -22,7 +22,8 @@ import { ObjectSchema, OperationGroup, Operation, - Parameter + Parameter, + SchemaResponse } from "@azure-tools/codemodel"; const cfg = { @@ -312,7 +313,7 @@ class Modeler { } @test - async "propagates 'nullable' to properties, parameters, and collections"() { + async "propagates 'nullable' to properties, parameters, collections, and responses"() { const spec = createTestSpec(); addSchema(spec, "WannaBeNullable", { @@ -325,14 +326,39 @@ class Modeler { } }); - addSchema(spec, "NullableArray", { + addSchema(spec, "NotNullable", { + type: "object", + nullable: true, + properties: { + iIsHere: { + type: "boolean" + } + } + }); + + addSchema(spec, "NullableArrayElement", { + type: "array", + items: { + nullable: true, + $ref: "#/components/schemas/NotNullable" + } + }); + + addSchema(spec, "NullableArrayElementSchema", { type: "array", items: { $ref: "#/components/schemas/WannaBeNullable" } }); - addSchema(spec, "NullableDictionary", { + addSchema(spec, "NullableDictionaryElement", { + additionalProperties: { + nullable: true, + $ref: "#/components/schemas/NotNullable" + } + }); + + addSchema(spec, "NullableDictionaryElementSchema", { additionalProperties: { $ref: "#/components/schemas/WannaBeNullable" } @@ -360,21 +386,47 @@ class Modeler { $ref: "#/components/schemas/WannaBeNullable" } } - ] + ], + responses: { + "200": { + content: { + "application/json": { + schema: { + type: "string", + nullable: true + } + } + } + } + } } }); const codeModel = await runModeler(spec); assertSchema( - "NullableArray", + "NullableArrayElement", codeModel.schemas.arrays, s => s.nullableItems, true ); assertSchema( - "NullableDictionary", + "NullableArrayElementSchema", + codeModel.schemas.arrays, + s => s.nullableItems, + true + ); + + assertSchema( + "NullableDictionaryElement", + codeModel.schemas.dictionaries, + s => s.nullableItems, + true + ); + + assertSchema( + "NullableDictionaryElementSchema", codeModel.schemas.dictionaries, s => s.nullableItems, true @@ -388,8 +440,12 @@ class Modeler { ); // $host param comes first then the parameter we're looking for - const param = codeModel.operationGroups[0].operations[0].parameters?.[1]; - assert.strictEqual(param?.nullable, true); + const operation = codeModel.operationGroups[0].operations[0]; + const param = operation.parameters![1]; + + const response: SchemaResponse = operation.responses![0]; + assert.strictEqual(param.nullable, true); + assert.strictEqual(response.nullable, true); } @test