quicktype-core 23.2.3 → 23.2.5

package/dist/RendererOptions/index.js

@@ -67,7 +67,7 @@ class BooleanOption extends Option {
         super({
             name,
             kind,
-            type: Boolean,
+            optionType: "boolean",
             description,
             defaultValue,
         });
@@ -110,29 +110,28 @@ class BooleanOption extends Option {
 exports.BooleanOption = BooleanOption;
 class StringOption extends Option {
     constructor(name, description, typeLabel, defaultValue, kind = "primary") {
-        const definition = {
+        super({
             name,
             kind,
-            type: String,
+            optionType: "string",
             description,
             typeLabel,
             defaultValue,
-        };
-        super(definition);
+        });
     }
 }
 exports.StringOption = StringOption;
 class EnumOption extends Option {
     constructor(name, description, values, defaultValue, kind = "primary") {
-        const definition = {
+        super({
             name,
             kind,
-            type: String,
+            optionType: "enum",
             description,
             typeLabel: Object.keys(values).join("|"),
             defaultValue,
-        };
-        super(definition);
+            values,
+        });
         this._values = values;
     }
     getEnumValue(name) {

package/dist/RendererOptions/types.d.ts

@@ -6,14 +6,22 @@ import type { EnumOption, Option } from "./index";
  */
 export type OptionKind = "primary" | "secondary" | "cli";
 export interface OptionDefinition<Name extends string = string, T = unknown> {
+    /** Option Name */
+    name: Name;
+    /** Option Alias for CLI */
     alias?: string;
-    defaultOption?: boolean;
-    defaultValue?: T;
+    /** Option Description */
     description: string;
+    /** Category of Option */
+    optionType: "string" | "boolean" | "enum";
+    /** Default Value for Option */
+    defaultValue?: T;
+    /** Enum only, map of possible keys and values */
+    values?: Record<string, unknown>;
+    /** Primary, Secondary, or CLI */
     kind?: OptionKind;
+    /** Whether multiple CLI inputs are allowed for this option */
     multiple?: boolean;
-    name: Name;
-    type: StringConstructor | BooleanConstructor;
     typeLabel?: string;
 }
 export type OptionName<O> = O extends Option<infer Name, unknown> ? Name : never;

package/dist/language/CSharp/CSharpRenderer.d.ts

@@ -42,4 +42,5 @@ export declare class CSharpRenderer extends ConvenienceRenderer {
     protected emitDefaultFollowingComments(): void;
     protected needNamespace(): boolean;
     protected emitSourceStructure(): void;
+    protected emitDependencyUsings(): void;
 }

package/dist/language/CSharp/CSharpRenderer.js

@@ -333,5 +333,17 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
         this.emitDefaultFollowingComments();
     }
+    emitDependencyUsings() {
+        let genericEmited = false;
+        let ensureGenericOnce = () => {
+            if (!genericEmited) {
+                this.emitUsing("System.Collections.Generic");
+                genericEmited = true;
+            }
+        };
+        this.typeGraph.allTypesUnordered().forEach(_ => {
+            (0, TypeUtils_1.matchCompoundType)(_, _arrayType => this._csOptions.useList ? ensureGenericOnce() : undefined, _classType => { }, _mapType => ensureGenericOnce(), _objectType => { }, _unionType => { });
+        });
+    }
 }
 exports.CSharpRenderer = CSharpRenderer;

package/dist/language/CSharp/NewtonSoftCSharpRenderer.js

@@ -67,9 +67,10 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
         return [extensionsName];
     }
     emitUsings() {
-        // FIXME: We need System.Collections.Generic whenever we have maps or use List.
-        if (!this._needAttributes && !this._needHelpers)
+        if (!this._needAttributes && !this._needHelpers) {
+            this.emitDependencyUsings();
             return;
+        }
         super.emitUsings();
         this.ensureBlankLine();
         for (const ns of [

package/dist/language/CSharp/SystemTextJsonCSharpRenderer.js

@@ -68,9 +68,10 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
         return [extensionsName];
     }
     emitUsings() {
-        // FIXME: We need System.Collections.Generic whenever we have maps or use List.
-        if (!this._needAttributes && !this._needHelpers)
+        if (!this._needAttributes && !this._needHelpers) {
+            this.emitDependencyUsings();
             return;
+        }
         super.emitUsings();
         this.ensureBlankLine();
         for (const ns of [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.2.3",
+    "version": "23.2.5",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",