@enigmatry/entry-components 17.0.0-preview.5.1 → 17.0.0-preview.7

package/README.md

@@ -1,33 +1,33 @@
-# Entry Components
-
-Set of reusable components based on Angular material.
-
-Visit components demo application. [Website](https://entry-demo.enigmatry.com/)
-
-## Installation
-
-```ts
-npm install @enigmatry/entry-components
-```
-
-### Theming Guidelines
-
-These guides provides detailed steps for setting up and configuring theming within your project.
-
-[**Theming Setup Guide**](https://github.com/enigmatry/entry-angular-building-blocks/blob/master/libs/entry-components/theming-setup.md)
-
-[**Theming Configuration Guide**](https://github.com/enigmatry/entry-angular-building-blocks/blob/master/libs/entry-components/theming-configuration.md)
-
-
-## Compatibility with Angular versions
-
-| @enigmatry/entry-components | Angular version
-|-|-|
-|14.x| = 14
-|15.x| = 15
-|16.x| = 16
-|17.x| = 17
-
-## License
-
+# Entry Components
+
+Set of reusable components based on Angular material.
+
+Visit components demo application. [Website](https://entry-demo.enigmatry.com/)
+
+## Installation
+
+```ts
+npm install @enigmatry/entry-components
+```
+
+### Theming Guidelines
+
+These guides provides detailed steps for setting up and configuring theming within your project.
+
+[**Theming Setup Guide**](https://github.com/enigmatry/entry-angular-building-blocks/blob/master/libs/entry-components/theming-setup.md)
+
+[**Theming Configuration Guide**](https://github.com/enigmatry/entry-angular-building-blocks/blob/master/libs/entry-components/theming-configuration.md)
+
+
+## Compatibility with Angular versions
+
+| @enigmatry/entry-components | Angular version
+|-|-|
+|14.x| = 14
+|15.x| = 15
+|16.x| = 16
+|17.x| = 17
+
+## License
+
 Apache-2 © Enigmatry

package/assets/nswag-templates/Client.RequestBody.liquid

@@ -1,95 +1,95 @@
-{%- if operation.HasFormParameters -%}
-{%-     if operation.ConsumesFormUrlEncoded -%}
-let content_ = "";
-{%-         for parameter in operation.FormParameters -%}
-{%-             if parameter.IsRequired -%}
-{%-                 if parameter.IsNullable -%}
-if ({{ parameter.VariableName }} === undefined)
-    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
-else
-{%-                 else -%}
-if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
-    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null.");
-else
-{%-                 endif -%}
-{%-             else -%}
-{%-                 if parameter.IsNullable -%}
-if ({{ parameter.VariableName }} !== undefined)
-{%-                 else -%}
-if ({{ parameter.VariableName }} === null)
-    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
-else if ({{ parameter.VariableName }} !== undefined)
-{%-                 endif -%}
-{%-             endif -%}
-{%-             if parameter.IsDateArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent(item_ ? formatDate(item_) : "null") + "&"; });
-{%-             elsif parameter.IsDateOrDateTimeArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent(item_ ? "" + item_.toJSON() : "null") + "&"; });
-{%-             elsif parameter.IsObjectArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item_, index_) => {
-        for (const attr_ in item_) {
-           if (item_.hasOwnProperty(attr_)) {
-                content_ += encodeURIComponent("{{ parameter.Name }}[" + index_ + "]." + attr_) + "=" + encodeURIComponent("" + (item_ as any)[attr_]) + "&";
-           }
-        }
-    });
-{%-             elsif parameter.IsDate -%}
-    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent({{ parameter.VariableName }} ? formatDate({{ parameter.VariableName }}) : "{{ QueryNullValue }}") + "&";
-{%-             elsif parameter.IsDateOrDateTime -%}
-    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.toJSON() : "{{ QueryNullValue }}") + "&";
-{%-             elsif parameter.IsArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + item) + "&"; });
-{%-             else -%}
-    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&";
-{%-             endif -%}
-{%-         endfor -%}
-content_ = content_.replace(/&$/, "");
-
-{%-     else -%}
-const content_ = new FormData();
-{%         for parameter in operation.FormParameters -%}
-{%-             if parameter.IsNullable -%}
-if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined)
-{%-             else -%}
-if ({{ parameter.VariableName }} === null || {{ parameter.VariableName }} === undefined)
-    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
-else
-{%-             endif -%}
-{%-             if parameter.IsFile -%}
-{%-                 if parameter.IsArray -%}
-    {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.data, item_.fileName ? item_.fileName : "{{ parameter.Name }}") );
-{%-                 else -%}
-    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.data, {{ parameter.VariableName }}.fileName ? {{ parameter.VariableName }}.fileName : "{{ parameter.Name }}");
-{%-                 endif -%}
-{%-             elsif parameter.IsDate -%}
-    content_.append("{{ parameter.Name }}", formatDate({{ parameter.VariableName }}));
-{%-             elsif parameter.IsDateOrDateTime -%}
-    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toJSON());
-{%-             elsif parameter.IsObject -%}
-    content_.append("{{ parameter.Name }}", JSON.stringify({{ parameter.VariableName }}));
-{%-             elsif parameter.IsArray -%}
-    {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.toString()));
-{%-             else -%}
-    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toString());
-{%-             endif -%}
-{%-         endfor -%}
-{%-     endif -%}
-{%- else -%}
-{%-     if operation.HasContent -%}
-{%-         if operation.HasBinaryBodyParameter -%}
-const content_ = {{ operation.ContentParameter.VariableName }};
-{%-         elsif operation.HasXmlBodyParameter -%}
-const content_ = {{ operation.ContentParameter.VariableName }};
-{%          elsif operation.Consumes == "application/x-www-form-urlencoded" -%}
-const content_ = Object.keys({{ operation.ContentParameter.VariableName }} as any).map((key) => {
-    return encodeURIComponent(key) + '=' + encodeURIComponent(({{ operation.ContentParameter.VariableName }} as any)[key]);
-}).join('&')
-{%-         elsif operation.HasPlainTextBodyParameter -%}
-const content_ = {{ operation.ContentParameter.VariableName }};
-{%-         else -%}
-const content_ = JSON.stringify({{ operation.ContentParameter.VariableName }});
-{%-         endif -%}
-{%-     else -%}
-const content_ = undefined;
-{%-     endif -%}
-{%- endif -%}
+{%- if operation.HasFormParameters -%}
+{%-     if operation.ConsumesFormUrlEncoded -%}
+let content_ = "";
+{%-         for parameter in operation.FormParameters -%}
+{%-             if parameter.IsRequired -%}
+{%-                 if parameter.IsNullable -%}
+if ({{ parameter.VariableName }} === undefined)
+    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
+else
+{%-                 else -%}
+if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
+    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null.");
+else
+{%-                 endif -%}
+{%-             else -%}
+{%-                 if parameter.IsNullable -%}
+if ({{ parameter.VariableName }} !== undefined)
+{%-                 else -%}
+if ({{ parameter.VariableName }} === null)
+    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
+else if ({{ parameter.VariableName }} !== undefined)
+{%-                 endif -%}
+{%-             endif -%}
+{%-             if parameter.IsDateArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent(item_ ? formatDate(item_) : "null") + "&"; });
+{%-             elsif parameter.IsDateOrDateTimeArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent(item_ ? "" + item_.toJSON() : "null") + "&"; });
+{%-             elsif parameter.IsObjectArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item_, index_) => {
+        for (const attr_ in item_) {
+           if (item_.hasOwnProperty(attr_)) {
+                content_ += encodeURIComponent("{{ parameter.Name }}[" + index_ + "]." + attr_) + "=" + encodeURIComponent("" + (item_ as any)[attr_]) + "&";
+           }
+        }
+    });
+{%-             elsif parameter.IsDate -%}
+    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent({{ parameter.VariableName }} ? formatDate({{ parameter.VariableName }}) : "{{ QueryNullValue }}") + "&";
+{%-             elsif parameter.IsDateOrDateTime -%}
+    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.toJSON() : "{{ QueryNullValue }}") + "&";
+{%-             elsif parameter.IsArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + item) + "&"; });
+{%-             else -%}
+    content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&";
+{%-             endif -%}
+{%-         endfor -%}
+content_ = content_.replace(/&$/, "");
+
+{%-     else -%}
+const content_ = new FormData();
+{%         for parameter in operation.FormParameters -%}
+{%-             if parameter.IsNullable -%}
+if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined)
+{%-             else -%}
+if ({{ parameter.VariableName }} === null || {{ parameter.VariableName }} === undefined)
+    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
+else
+{%-             endif -%}
+{%-             if parameter.IsFile -%}
+{%-                 if parameter.IsArray -%}
+    {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.data, item_.fileName ? item_.fileName : "{{ parameter.Name }}") );
+{%-                 else -%}
+    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.data, {{ parameter.VariableName }}.fileName ? {{ parameter.VariableName }}.fileName : "{{ parameter.Name }}");
+{%-                 endif -%}
+{%-             elsif parameter.IsDate -%}
+    content_.append("{{ parameter.Name }}", formatDate({{ parameter.VariableName }}));
+{%-             elsif parameter.IsDateOrDateTime -%}
+    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toJSON());
+{%-             elsif parameter.IsObject -%}
+    content_.append("{{ parameter.Name }}", JSON.stringify({{ parameter.VariableName }}));
+{%-             elsif parameter.IsArray -%}
+    {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.toString()));
+{%-             else -%}
+    content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toString());
+{%-             endif -%}
+{%-         endfor -%}
+{%-     endif -%}
+{%- else -%}
+{%-     if operation.HasContent -%}
+{%-         if operation.HasBinaryBodyParameter -%}
+const content_ = {{ operation.ContentParameter.VariableName }};
+{%-         elsif operation.HasXmlBodyParameter -%}
+const content_ = {{ operation.ContentParameter.VariableName }};
+{%          elsif operation.Consumes == "application/x-www-form-urlencoded" -%}
+const content_ = Object.keys({{ operation.ContentParameter.VariableName }} as any).map((key) => {
+    return encodeURIComponent(key) + '=' + encodeURIComponent(({{ operation.ContentParameter.VariableName }} as any)[key]);
+}).join('&')
+{%-         elsif operation.HasPlainTextBodyParameter -%}
+const content_ = {{ operation.ContentParameter.VariableName }};
+{%-         else -%}
+const content_ = JSON.stringify({{ operation.ContentParameter.VariableName }});
+{%-         endif -%}
+{%-     else -%}
+const content_ = undefined;
+{%-     endif -%}
+{%- endif -%}

package/assets/nswag-templates/Client.RequestUrl.liquid

@@ -1,68 +1,68 @@
-let url_ = this.baseUrl + "/{{ operation.Path }}{% if operation.HasQueryParameters %}?{% endif %}";
-{% for parameter in operation.PathParameters -%}
-{%    if parameter.IsRequired -%}
-if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
-    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
-{%    else -%}
-if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined)
-{%    endif -%}
-{%    if parameter.IsDateArray -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.map(s_ => s_ ? formatDate(s_) : "null").join()));
-{%    elsif parameter.IsDateTimeArray -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.map(s_ => s_ ? s_.{{ parameter.GetDateTimeToString }} : "null").join()));
-{%    elsif parameter.IsDate -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }} ? "" + formatDate({{ parameter.VariableName }}) : "null"));
-{%    elsif parameter.IsDateTime -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "null"));
-{%    elsif parameter.IsArray -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.join()));
-{%    else -%}
-url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent("" + {{ parameter.VariableName }}));
-{%    endif -%}
-{%    if parameter.IsOptional -%}
-else
-    url_ = url_.replace("/{{ "{" }}{{ parameter.Name }}}", "");
-{%    endif -%}
-{% endfor -%}
-{% for parameter in operation.QueryParameters -%}
-{%    if parameter.IsRequired -%}
-{%        if parameter.IsNullable -%}
-if ({{ parameter.VariableName }} === undefined)
-    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
-else if({{ parameter.VariableName }} !== null)
-{%        else -%}
-if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
-    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null.");
-else
-{%        endif -%}
-{%    else -%}
-{%        if parameter.IsNullable -%}
-if ({{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null)
-{%        else -%}
-if ({{ parameter.VariableName }} === null)
-    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
-else if ({{ parameter.VariableName }} !== undefined)
-{%        endif -%}
-{%    endif -%}
-{%    if parameter.IsDateArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { url_ += "{{ parameter.Name }}=" + encodeURIComponent(item_ ? "" + formatDate(item_) : "null") + "&"; });
-{%    elsif parameter.IsDateTimeArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { url_ += "{{ parameter.Name }}=" + encodeURIComponent(item_ ? "" + item_.{{ parameter.GetDateTimeToString }} : "null") + "&"; });
-{%    elsif parameter.IsObjectArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item, index) => {
-        for (const attr in item)
-			if (item.hasOwnProperty(attr)) {
-				url_ += "{{ parameter.Name }}[" + index + "]." + attr + "=" + encodeURIComponent("" + (item as any)[attr]) + "&";
-			}
-    });
-{%    elsif parameter.IsDate -%}
-    url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + formatDate({{ parameter.VariableName }}) : "{{ QueryNullValue }}") + "&";
-{%    elsif parameter.IsDateTime -%}
-    url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "{{ QueryNullValue }}") + "&";
-{%    elsif parameter.IsArray -%}
-    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + item) + "&"; });
-{%    else -%}
-    url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&";
-{%    endif -%}
-{% endfor -%}
+let url_ = this.baseUrl + "/{{ operation.Path }}{% if operation.HasQueryParameters %}?{% endif %}";
+{% for parameter in operation.PathParameters -%}
+{%    if parameter.IsRequired -%}
+if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
+    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
+{%    else -%}
+if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined)
+{%    endif -%}
+{%    if parameter.IsDateArray -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.map(s_ => s_ ? formatDate(s_) : "null").join()));
+{%    elsif parameter.IsDateTimeArray -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.map(s_ => s_ ? s_.{{ parameter.GetDateTimeToString }} : "null").join()));
+{%    elsif parameter.IsDate -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }} ? "" + formatDate({{ parameter.VariableName }}) : "null"));
+{%    elsif parameter.IsDateTime -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "null"));
+{%    elsif parameter.IsArray -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.join()));
+{%    else -%}
+url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent("" + {{ parameter.VariableName }}));
+{%    endif -%}
+{%    if parameter.IsOptional -%}
+else
+    url_ = url_.replace("/{{ "{" }}{{ parameter.Name }}}", "");
+{%    endif -%}
+{% endfor -%}
+{% for parameter in operation.QueryParameters -%}
+{%    if parameter.IsRequired -%}
+{%        if parameter.IsNullable -%}
+if ({{ parameter.VariableName }} === undefined)
+    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined.");
+else if({{ parameter.VariableName }} !== null)
+{%        else -%}
+if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null)
+    throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null.");
+else
+{%        endif -%}
+{%    else -%}
+{%        if parameter.IsNullable -%}
+if ({{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null)
+{%        else -%}
+if ({{ parameter.VariableName }} === null)
+    throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null.");
+else if ({{ parameter.VariableName }} !== undefined)
+{%        endif -%}
+{%    endif -%}
+{%    if parameter.IsDateArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { url_ += "{{ parameter.Name }}=" + encodeURIComponent(item_ ? "" + formatDate(item_) : "null") + "&"; });
+{%    elsif parameter.IsDateTimeArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { url_ += "{{ parameter.Name }}=" + encodeURIComponent(item_ ? "" + item_.{{ parameter.GetDateTimeToString }} : "null") + "&"; });
+{%    elsif parameter.IsObjectArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item, index) => {
+        for (const attr in item)
+			if (item.hasOwnProperty(attr)) {
+				url_ += "{{ parameter.Name }}[" + index + "]." + attr + "=" + encodeURIComponent("" + (item as any)[attr]) + "&";
+			}
+    });
+{%    elsif parameter.IsDate -%}
+    url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + formatDate({{ parameter.VariableName }}) : "{{ QueryNullValue }}") + "&";
+{%    elsif parameter.IsDateTime -%}
+    url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "{{ QueryNullValue }}") + "&";
+{%    elsif parameter.IsArray -%}
+    {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + item) + "&"; });
+{%    else -%}
+    url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&";
+{%    endif -%}
+{% endfor -%}
 url_ = url_.replace(/[?&]$/, "");

package/assets/nswag-templates/ConvertToClass.liquid

@@ -1,65 +1,65 @@
-{% if IsNewableObject -%}
-{%   if CheckNewableObject -%}
-{{ Variable }} = {{ Value }} ? {{ Type }}.fromJS({{ Value }}{% if HandleReferences -%}, _mappings{% endif %}) : {% if HasDefaultValue %}{{ DefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%   else -%}
-{{ Variable }} = {{ Type }}.fromJS({{ Value }}{% if HandleReferences -%}, _mappings{% endif %});
-{%   endif -%}
-{% elsif IsArray -%}
-if (Array.isArray({{ Value }})) {
-    {{ Variable }} = [] as any;
-    for (let item of {{ Value }})
-{%   if IsArrayItemNewableObject -%}
-        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ ArrayItemType }}.fromJS(item{% if HandleReferences %}, _mappings{% endif %}));
-{%   else -%}
-{%     if IsArrayItemDate -%}
-        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ "parseDateOnly" }}(item));
-{%     elsif IsArrayItemDateTime -%}
-        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ StringToDateCode }}(item));
-{%     else -%}
-        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push(item);
-{%     endif -%}
-{%   endif -%}
-}
-{% if NullValue != "undefined" %}else {
-    {{ Variable }} = <any>{{ NullValue }};
-}
-{% endif -%}
-{% elsif IsDictionary -%}
-if ({{ Value }}) {
-    {{ Variable }} = {} as any;
-    for (let key in {{ Value }}) {
-        if ({{ Value }}.hasOwnProperty(key))
-{%     if IsDictionaryValueNewableObject -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ DictionaryValueType }}.fromJS({{ Value }}[key]{% if HandleReferences %}, _mappings{% endif %}) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%     elsif IsDictionaryValueNewableArray -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ Value }}[key].map((i: any) => {{ DictionaryValueArrayItemType }}.fromJS(i{% if HandleReferences %}, _mappings{% endif %})) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%     elsif IsDictionaryValueDate -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ "parseDateOnly" }}({{ Value }}[key].toString()) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%     elsif IsDictionaryValueDateTime -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ StringToDateCode }}({{ Value }}[key].toString()) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%     else -%}
-{%         if HasDictionaryValueDefaultValue or NullValue != "undefined" -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] !== undefined ? {{ Value }}[key] : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%         else -%}
-            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key];
-{%         endif -%}
-{%     endif -%}
-    }
-}
-{% if NullValue != "undefined" %}else {
-    {{ Variable }} = <any>{{ NullValue }};
-}
-{% endif -%}
-{% else -%}
-    {% if IsDate -%}
-{{ Variable }} = {{ Value }} ? {{ "parseDateOnly" }}({{ Value }}.toString()) : {% if HasDefaultValue %}{{ "parseDateOnly" }}({{ DefaultValue }}){% else %}<any>{{ NullValue }}{% endif %};
-    {% elsif IsDateTime -%}
-{{ Variable }} = {{ Value }} ? {{ StringToDateCode }}({{ Value }}.toString()) : {% if HasDefaultValue %}{{ StringToDateCode }}({{ DefaultValue }}){% else %}<any>{{ NullValue }}{% endif %};
-    {% else -%}
-{%       if HasDefaultValue or NullValue != "undefined" -%}
-{{ Variable }} = {{ Value }} !== undefined ? {{ Value }} : {% if HasDefaultValue %}{{ DefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
-{%       else -%}
-{{ Variable }} = {{ Value }};
-{%       endif -%}
-    {% endif -%}
+{% if IsNewableObject -%}
+{%   if CheckNewableObject -%}
+{{ Variable }} = {{ Value }} ? {{ Type }}.fromJS({{ Value }}{% if HandleReferences -%}, _mappings{% endif %}) : {% if HasDefaultValue %}{{ DefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%   else -%}
+{{ Variable }} = {{ Type }}.fromJS({{ Value }}{% if HandleReferences -%}, _mappings{% endif %});
+{%   endif -%}
+{% elsif IsArray -%}
+if (Array.isArray({{ Value }})) {
+    {{ Variable }} = [] as any;
+    for (let item of {{ Value }})
+{%   if IsArrayItemNewableObject -%}
+        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ ArrayItemType }}.fromJS(item{% if HandleReferences %}, _mappings{% endif %}));
+{%   else -%}
+{%     if IsArrayItemDate -%}
+        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ "parseDateOnly" }}(item));
+{%     elsif IsArrayItemDateTime -%}
+        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push({{ StringToDateCode }}(item));
+{%     else -%}
+        {{ Variable }}{% if RequiresStrictPropertyInitialization %}!{% endif %}.push(item);
+{%     endif -%}
+{%   endif -%}
+}
+{% if NullValue != "undefined" %}else {
+    {{ Variable }} = <any>{{ NullValue }};
+}
+{% endif -%}
+{% elsif IsDictionary -%}
+if ({{ Value }}) {
+    {{ Variable }} = {} as any;
+    for (let key in {{ Value }}) {
+        if ({{ Value }}.hasOwnProperty(key))
+{%     if IsDictionaryValueNewableObject -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ DictionaryValueType }}.fromJS({{ Value }}[key]{% if HandleReferences %}, _mappings{% endif %}) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%     elsif IsDictionaryValueNewableArray -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ Value }}[key].map((i: any) => {{ DictionaryValueArrayItemType }}.fromJS(i{% if HandleReferences %}, _mappings{% endif %})) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%     elsif IsDictionaryValueDate -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ "parseDateOnly" }}({{ Value }}[key].toString()) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%     elsif IsDictionaryValueDateTime -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] ? {{ StringToDateCode }}({{ Value }}[key].toString()) : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%     else -%}
+{%         if HasDictionaryValueDefaultValue or NullValue != "undefined" -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key] !== undefined ? {{ Value }}[key] : {% if HasDictionaryValueDefaultValue %}{{ DictionaryValueDefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%         else -%}
+            (<any>{{ Variable }}){% if RequiresStrictPropertyInitialization %}!{% endif %}[key] = {{ Value }}[key];
+{%         endif -%}
+{%     endif -%}
+    }
+}
+{% if NullValue != "undefined" %}else {
+    {{ Variable }} = <any>{{ NullValue }};
+}
+{% endif -%}
+{% else -%}
+    {% if IsDate -%}
+{{ Variable }} = {{ Value }} ? {{ "parseDateOnly" }}({{ Value }}.toString()) : {% if HasDefaultValue %}{{ "parseDateOnly" }}({{ DefaultValue }}){% else %}<any>{{ NullValue }}{% endif %};
+    {% elsif IsDateTime -%}
+{{ Variable }} = {{ Value }} ? {{ StringToDateCode }}({{ Value }}.toString()) : {% if HasDefaultValue %}{{ StringToDateCode }}({{ DefaultValue }}){% else %}<any>{{ NullValue }}{% endif %};
+    {% else -%}
+{%       if HasDefaultValue or NullValue != "undefined" -%}
+{{ Variable }} = {{ Value }} !== undefined ? {{ Value }} : {% if HasDefaultValue %}{{ DefaultValue }}{% else %}<any>{{ NullValue }}{% endif %};
+{%       else -%}
+{{ Variable }} = {{ Value }};
+{%       endif -%}
+    {% endif -%}
 {% endif -%}