quicktype-core 23.0.4 → 23.0.6

package/dist/index.d.ts

@@ -39,6 +39,8 @@ export { JavaScriptPropTypesTargetLanguage, JavaScriptPropTypesRenderer, javaScr
 export { TypeScriptTargetLanguage, TypeScriptRenderer, FlowTargetLanguage, FlowRenderer, tsFlowOptions } from "./language/TypeScriptFlow";
 export { SwiftTargetLanguage, SwiftRenderer, swiftOptions } from "./language/Swift";
 export { KotlinTargetLanguage, KotlinRenderer, kotlinOptions } from "./language/Kotlin";
+export { Scala3TargetLanguage, Scala3Renderer, scala3Options } from "./language/Scala3";
+export { SmithyTargetLanguage, Smithy4sRenderer, SmithyOptions } from "./language/Smithy4s";
 export { ElmTargetLanguage, ElmRenderer, elmOptions } from "./language/Elm";
 export { JSONSchemaTargetLanguage, JSONSchemaRenderer } from "./language/JSONSchema";
 export { RustTargetLanguage, RustRenderer, rustOptions } from "./language/Rust";

package/dist/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassType = exports.ArrayType = exports.PrimitiveType = exports.Type = exports.messageAssert = exports.messageError = exports.QuickTypeError = exports.trainMarkovChain = exports.isLetterOrDigit = exports.legalizeCharacters = exports.allUpperWordStyle = exports.firstUpperWordStyle = exports.combineWords = exports.capitalize = exports.splitIntoWords = exports.inflateBase64 = exports.checkArray = exports.checkStringMap = exports.parseJSON = exports.assertNever = exports.defined = exports.assert = exports.panic = exports.IssueAnnotationData = exports.Namer = exports.funPrefixNamer = exports.Name = exports.parenIfNeeded = exports.singleWord = exports.modifySource = exports.languageNamed = exports.defaultTargetLanguages = exports.TargetLanguage = exports.getOptionValues = exports.Option = exports.Ref = exports.JSONSchemaInput = exports.jsonInputForTargetLanguage = exports.JSONInput = exports.InputData = exports.CompressedJSON = exports.inferenceFlagsObject = exports.defaultInferenceFlags = exports.inferenceFlagNames = exports.inferenceFlags = exports.combineRenderResults = exports.quicktype = exports.quicktypeMultiFileSync = exports.quicktypeMultiFile = exports.getTargetLanguage = void 0;
 exports.TypeScriptRenderer = exports.TypeScriptTargetLanguage = exports.javaScriptPropTypesOptions = exports.JavaScriptPropTypesRenderer = exports.JavaScriptPropTypesTargetLanguage = exports.javaScriptOptions = exports.JavaScriptRenderer = exports.JavaScriptTargetLanguage = exports.javaOptions = exports.JavaRenderer = exports.JavaTargetLanguage = exports.objcOptions = exports.ObjectiveCRenderer = exports.ObjectiveCTargetLanguage = exports.goOptions = exports.GoRenderer = exports.GoTargetLanguage = exports.pythonOptions = exports.PythonRenderer = exports.PythonTargetLanguage = exports.CSharpRenderer = exports.cSharpOptions = exports.CSharpTargetLanguage = exports.cPlusPlusOptions = exports.CPlusPlusRenderer = exports.CPlusPlusTargetLanguage = exports.uriTypeAttributeKind = exports.ConvenienceRenderer = exports.nullableFromUnion = exports.matchType = exports.removeNullFromUnion = exports.StringTypes = exports.namesTypeAttributeKind = exports.makeNamesTypeAttributes = exports.TypeNames = exports.emptyTypeAttributes = exports.TypeAttributeKind = exports.derefTypeRef = exports.TypeBuilder = exports.sourcesFromPostmanCollection = exports.JSONSchemaStore = exports.FetchingJSONSchemaStore = exports.readFromFileOrURL = exports.readableFromFileOrURL = exports.getStream = exports.ObjectType = exports.UnionType = exports.MapType = exports.EnumType = exports.ClassProperty = void 0;
-exports.dartOptions = exports.DartRenderer = exports.DartTargetLanguage = exports.haskellOptions = exports.HaskellRenderer = exports.HaskellTargetLanguage = exports.CrystalRenderer = exports.CrystalTargetLanguage = exports.rubyOptions = exports.RubyRenderer = exports.RubyTargetLanguage = exports.rustOptions = exports.RustRenderer = exports.RustTargetLanguage = exports.JSONSchemaRenderer = exports.JSONSchemaTargetLanguage = exports.elmOptions = exports.ElmRenderer = exports.ElmTargetLanguage = exports.kotlinOptions = exports.KotlinRenderer = exports.KotlinTargetLanguage = exports.swiftOptions = exports.SwiftRenderer = exports.SwiftTargetLanguage = exports.tsFlowOptions = exports.FlowRenderer = exports.FlowTargetLanguage = void 0;
+exports.dartOptions = exports.DartRenderer = exports.DartTargetLanguage = exports.haskellOptions = exports.HaskellRenderer = exports.HaskellTargetLanguage = exports.CrystalRenderer = exports.CrystalTargetLanguage = exports.rubyOptions = exports.RubyRenderer = exports.RubyTargetLanguage = exports.rustOptions = exports.RustRenderer = exports.RustTargetLanguage = exports.JSONSchemaRenderer = exports.JSONSchemaTargetLanguage = exports.elmOptions = exports.ElmRenderer = exports.ElmTargetLanguage = exports.SmithyOptions = exports.Smithy4sRenderer = exports.SmithyTargetLanguage = exports.scala3Options = exports.Scala3Renderer = exports.Scala3TargetLanguage = exports.kotlinOptions = exports.KotlinRenderer = exports.KotlinTargetLanguage = exports.swiftOptions = exports.SwiftRenderer = exports.SwiftTargetLanguage = exports.tsFlowOptions = exports.FlowRenderer = exports.FlowTargetLanguage = void 0;
 var Run_1 = require("./Run");
 Object.defineProperty(exports, "getTargetLanguage", { enumerable: true, get: function () { return Run_1.getTargetLanguage; } });
 Object.defineProperty(exports, "quicktypeMultiFile", { enumerable: true, get: function () { return Run_1.quicktypeMultiFile; } });
@@ -152,6 +152,14 @@ var Kotlin_1 = require("./language/Kotlin");
 Object.defineProperty(exports, "KotlinTargetLanguage", { enumerable: true, get: function () { return Kotlin_1.KotlinTargetLanguage; } });
 Object.defineProperty(exports, "KotlinRenderer", { enumerable: true, get: function () { return Kotlin_1.KotlinRenderer; } });
 Object.defineProperty(exports, "kotlinOptions", { enumerable: true, get: function () { return Kotlin_1.kotlinOptions; } });
+var Scala3_1 = require("./language/Scala3");
+Object.defineProperty(exports, "Scala3TargetLanguage", { enumerable: true, get: function () { return Scala3_1.Scala3TargetLanguage; } });
+Object.defineProperty(exports, "Scala3Renderer", { enumerable: true, get: function () { return Scala3_1.Scala3Renderer; } });
+Object.defineProperty(exports, "scala3Options", { enumerable: true, get: function () { return Scala3_1.scala3Options; } });
+var Smithy4s_1 = require("./language/Smithy4s");
+Object.defineProperty(exports, "SmithyTargetLanguage", { enumerable: true, get: function () { return Smithy4s_1.SmithyTargetLanguage; } });
+Object.defineProperty(exports, "Smithy4sRenderer", { enumerable: true, get: function () { return Smithy4s_1.Smithy4sRenderer; } });
+Object.defineProperty(exports, "SmithyOptions", { enumerable: true, get: function () { return Smithy4s_1.SmithyOptions; } });
 var Elm_1 = require("./language/Elm");
 Object.defineProperty(exports, "ElmTargetLanguage", { enumerable: true, get: function () { return Elm_1.ElmTargetLanguage; } });
 Object.defineProperty(exports, "ElmRenderer", { enumerable: true, get: function () { return Elm_1.ElmRenderer; } });

package/dist/language/All.js

@@ -12,6 +12,8 @@ const JavaScriptPropTypes_1 = require("./JavaScriptPropTypes");
 const TypeScriptFlow_1 = require("./TypeScriptFlow");
 const Swift_1 = require("./Swift");
 const Kotlin_1 = require("./Kotlin");
+const Scala3_1 = require("./Scala3");
+const Smithy4s_1 = require("./Smithy4s");
 const Elm_1 = require("./Elm");
 const JSONSchema_1 = require("./JSONSchema");
 const Rust_1 = require("./Rust");
@@ -35,6 +37,8 @@ exports.all = [
     new JavaScriptPropTypes_1.JavaScriptPropTypesTargetLanguage(),
     new TypeScriptFlow_1.FlowTargetLanguage(),
     new Swift_1.SwiftTargetLanguage(),
+    new Scala3_1.Scala3TargetLanguage(),
+    new Smithy4s_1.SmithyTargetLanguage(),
     new Kotlin_1.KotlinTargetLanguage(),
     new Elm_1.ElmTargetLanguage(),
     new JSONSchema_1.JSONSchemaTargetLanguage(),

package/dist/language/CPlusPlus.js

@@ -765,7 +765,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u, true);
         (0, Support_2.assert)(nonNulls.size >= 2, "Variant not needed for less than two types.");
         const indirection = maybeNull !== null;
-        const variant = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: !indirection, needsOptionalIndirection: !indirection, inJsonNamespace }, true, false);
+        const variant = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: !indirection,
+            needsOptionalIndirection: !indirection,
+            inJsonNamespace
+        }, true, false);
         if (!indirection) {
             return variant;
         }
@@ -814,7 +818,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
         }, arrayType => [
             "std::vector<",
-            this.cppType(arrayType.items, { needsForwardIndirection: false, needsOptionalIndirection: true, inJsonNamespace }, withIssues, forceNarrowString, false),
+            this.cppType(arrayType.items, {
+                needsForwardIndirection: false,
+                needsOptionalIndirection: true,
+                inJsonNamespace
+            }, withIssues, forceNarrowString, false),
             ">"
         ], classType => this.variantIndirection(classType, ctx.needsForwardIndirection && this.isForwardDeclaredType(classType) && !isOptional, [this.ourQualifier(inJsonNamespace), this.nameForNamedType(classType)]), mapType => {
             let keyType = this._stringType.getType();
@@ -825,14 +833,22 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 "std::map<",
                 keyType,
                 ", ",
-                this.cppType(mapType.values, { needsForwardIndirection: false, needsOptionalIndirection: true, inJsonNamespace }, withIssues, forceNarrowString, false),
+                this.cppType(mapType.values, {
+                    needsForwardIndirection: false,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace
+                }, withIssues, forceNarrowString, false),
                 ">"
             ];
         }, enumType => [this.ourQualifier(inJsonNamespace), this.nameForNamedType(enumType)], unionType => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {
                 isOptional = true;
-                return this.cppType(nullable, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace }, withIssues, forceNarrowString, false);
+                return this.cppType(nullable, {
+                    needsForwardIndirection: false,
+                    needsOptionalIndirection: false,
+                    inJsonNamespace
+                }, withIssues, forceNarrowString, false);
             }
             else {
                 return [this.ourQualifier(inJsonNamespace), this.nameForNamedType(unionType)];
@@ -920,7 +936,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.codeFormat) {
             this.emitLine("private:");
             this.forEachClassProperty(c, "none", (name, jsonName, property) => {
-                this.emitMember(this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional), name);
+                this.emitMember(this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional), name);
                 if (constraints !== undefined && constraints.has(jsonName)) {
                     /** FIXME!!! NameStyle will/can collide with other Names */
                     const cnst = this.lookupGlobalName(GlobalNames.ClassMemberConstraints);
@@ -933,11 +953,19 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.forEachClassProperty(c, "none", (name, jsonName, property) => {
             this.emitDescription(this.descriptionForClassProperty(c, jsonName));
             if (!this._options.codeFormat) {
-                this.emitMember(this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional), name);
+                this.emitMember(this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional), name);
             }
             else {
                 const [getterName, mutableGetterName, setterName] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
-                const rendered = this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional);
+                const rendered = this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional);
                 /**
                  * fix for optional type -> e.g. unique_ptrs can't be copied
                  * One might as why the "this->xxx = value". Simple if we have
@@ -1067,8 +1095,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 className,
                 "& x)"
             ], false, () => {
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, true, false);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, false, false);
                 this.emitLine([
                     "x = ",
                     this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
@@ -1087,8 +1123,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.withConst([ourQualifier, className]),
                 " & x)"
             ], false, () => {
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, false, false);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, true, false);
                 this.emitLine([
                     "j = ",
                     this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, "x"),
@@ -1157,8 +1201,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         return;
                     }
                 }
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, true, p.isOptional);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, false, p.isOptional);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, true, p.isOptional);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, false, p.isOptional);
                 this.emitLine(assignment.wrap([], this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
                     "j.at(",
                     this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(json)])),
@@ -1173,8 +1225,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("j = json::object();");
             this.forEachClassProperty(c, "none", (name, json, p) => {
                 const t = p.type;
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, false, p.isOptional);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, true, p.isOptional);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, false, p.isOptional);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, true, p.isOptional);
                 const [getterName, ,] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
                 let getter;
                 if (this._options.codeFormat) {
@@ -1232,7 +1292,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         // but it's nontrivial to detect that (consider variant<string, variant<map<string, string>, int>> which
         // does need an adl_serializer specialization) so we'll just specialize every time.
         const nonNulls = (0, TypeUtils_1.removeNullFromUnion)(u, true)[1];
-        const variantType = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false);
+        const variantType = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false);
         this.emitLine("template <>");
         this.emitBlock(["struct adl_serializer<", variantType, ">"], true, () => {
             this.emitLine("static void from_json(", this.withConst("json"), " & j, ", variantType, " & x);");
@@ -1253,7 +1317,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             ["enum", "is_string"]
         ];
         const nonNulls = (0, TypeUtils_1.removeNullFromUnion)(u, true)[1];
-        const variantType = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false);
+        const variantType = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false);
         this.emitBlock([
             "inline void adl_serializer<",
             variantType,
@@ -1270,8 +1338,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     continue;
                 this.emitLine(onFirst ? "if" : "else if", " (j.", func, "())");
                 this.indent(() => {
-                    const cppType = this.cppType(typeForKind, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
-                    let toType = this.cppType(typeForKind, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
+                    const cppType = this.cppType(typeForKind, {
+                        needsForwardIndirection: true,
+                        needsOptionalIndirection: true,
+                        inJsonNamespace: true
+                    }, false, true, false);
+                    let toType = this.cppType(typeForKind, {
+                        needsForwardIndirection: true,
+                        needsOptionalIndirection: true,
+                        inJsonNamespace: true
+                    }, false, false, false);
                     this.emitLine("x = ", this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
                         "j.get<",
                         cppType,
@@ -1280,7 +1356,6 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 });
                 onFirst = false;
             }
-            // this.emitLine('else throw "Could not deserialize";');
             this.emitLine('else throw std::runtime_error("Could not deserialise!");');
         });
         this.ensureBlankLine();
@@ -1309,7 +1384,6 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     });
                     i++;
                 }
-                // this.emitLine('default: throw "Input JSON does not conform to schema";');
                 this.emitLine('default: throw std::runtime_error("Input JSON does not conform to schema!");');
             });
         });
@@ -1352,7 +1426,6 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.emitLine(maybeElse, "if (j == ", this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), [this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(jsonName)])]), ") x = ", ourQualifier, enumName, "::", name, ";");
                     onFirst = false;
                 });
-                // this.emitLine('else throw "Input JSON does not conform to schema";');
                 this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
             }
         });
@@ -1362,19 +1435,30 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.forEachEnumCase(e, "none", (name, jsonName) => {
                     this.emitLine("case ", ourQualifier, enumName, "::", name, ": j = ", this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), [this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(jsonName)])]), "; break;");
                 });
-                // this.emitLine('default: throw "This should not happen";');
                 this.emitLine('default: throw std::runtime_error("This should not happen");');
             });
         });
     }
     emitTopLevelTypedef(t, name) {
-        this.emitLine("using ", name, " = ", this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, false), ";");
+        this.emitLine("using ", name, " = ", this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: false
+        }, true, false, false), ";");
     }
     emitAllUnionFunctions() {
-        this.forEachUniqueUnion("leading-and-interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false)), (u) => this.emitUnionFunctions(u));
+        this.forEachUniqueUnion("leading-and-interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false)), (u) => this.emitUnionFunctions(u));
     }
     emitAllUnionHeaders() {
-        this.forEachUniqueUnion("interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false)), (u) => this.emitUnionHeaders(u));
+        this.forEachUniqueUnion("interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false)), (u) => this.emitUnionHeaders(u));
     }
     emitOptionalHelpers() {
         this.emitLine("#ifndef NLOHMANN_OPT_HELPER");
@@ -1956,8 +2040,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     isConversionRequired(t) {
-        let originalType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
-        let newType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
+        let originalType = this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: true
+        }, false, false, false);
+        let newType = this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: true
+        }, false, true, false);
         return originalType !== newType;
     }
 }

package/dist/language/Scala3.d.ts

@@ -0,0 +1,77 @@
+import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
+import { Name, Namer } from "../Naming";
+import { EnumOption, Option, StringOption, OptionValues } from "../RendererOptions";
+import { Sourcelike } from "../Source";
+import { TargetLanguage } from "../TargetLanguage";
+import { ArrayType, ClassType, EnumType, MapType, ObjectType, Type, UnionType } from "../Type";
+import { RenderContext } from "../Renderer";
+export declare enum Framework {
+    None = 0,
+    Upickle = 1,
+    Circe = 2
+}
+export declare const scala3Options: {
+    framework: EnumOption<Framework>;
+    packageName: StringOption;
+};
+export declare class Scala3Renderer extends ConvenienceRenderer {
+    protected readonly _scalaOptions: OptionValues<typeof scala3Options>;
+    constructor(targetLanguage: TargetLanguage, renderContext: RenderContext, _scalaOptions: OptionValues<typeof scala3Options>);
+    protected forbiddenNamesForGlobalNamespace(): string[];
+    protected forbiddenForObjectProperties(_: ObjectType, _classNamed: Name): ForbiddenWordsInfo;
+    protected forbiddenForEnumCases(_: EnumType, _enumName: Name): ForbiddenWordsInfo;
+    protected forbiddenForUnionMembers(_u: UnionType, _unionName: Name): ForbiddenWordsInfo;
+    protected topLevelNameStyle(rawName: string): string;
+    protected makeNamedTypeNamer(): Namer;
+    protected namerForObjectProperty(): Namer;
+    protected makeUnionMemberNamer(): Namer;
+    protected makeEnumCaseNamer(): Namer;
+    protected emitDescriptionBlock(lines: Sourcelike[]): void;
+    protected emitBlock(line: Sourcelike, f: () => void, delimiter?: "curly" | "paren" | "lambda" | "none"): void;
+    protected anySourceType(optional: boolean): Sourcelike;
+    protected arrayType(arrayType: ArrayType, withIssues?: boolean): Sourcelike;
+    protected mapType(mapType: MapType, withIssues?: boolean): Sourcelike;
+    protected scalaType(t: Type, withIssues?: boolean, noOptional?: boolean): Sourcelike;
+    protected emitUsageHeader(): void;
+    protected emitHeader(): void;
+    protected emitTopLevelArray(t: ArrayType, name: Name): void;
+    protected emitTopLevelMap(t: MapType, name: Name): void;
+    protected emitEmptyClassDefinition(c: ClassType, className: Name): void;
+    protected emitClassDefinition(c: ClassType, className: Name): void;
+    protected emitClassDefinitionMethods(): void;
+    protected emitEnumDefinition(e: EnumType, enumName: Name): void;
+    protected emitUnionDefinition(u: UnionType, unionName: Name): void;
+    protected emitSourceStructure(): void;
+}
+export declare class UpickleRenderer extends Scala3Renderer {
+    protected emitClassDefinitionMethods(): void;
+    protected emitHeader(): void;
+}
+export declare class Smithy4sRenderer extends Scala3Renderer {
+    protected emitHeader(): void;
+    protected emitTopLevelArray(t: ArrayType, name: Name): void;
+    protected emitTopLevelMap(t: MapType, name: Name): void;
+    protected emitEmptyClassDefinition(c: ClassType, className: Name): void;
+    protected emitEnumDefinition(e: EnumType, enumName: Name): void;
+}
+export declare class CirceRenderer extends Scala3Renderer {
+    seenUnionTypes: Array<string>;
+    protected circeEncoderForType(t: Type, _?: boolean, noOptional?: boolean, paramName?: string): Sourcelike;
+    protected emitEmptyClassDefinition(c: ClassType, className: Name): void;
+    protected anySourceType(optional: boolean): Sourcelike;
+    protected emitClassDefinitionMethods(): void;
+    protected emitEnumDefinition(e: EnumType, enumName: Name): void;
+    protected emitHeader(): void;
+    protected emitTopLevelArray(t: ArrayType, name: Name): void;
+    protected emitTopLevelMap(t: MapType, name: Name): void;
+    protected emitUnionDefinition(u: UnionType, unionName: Name): void;
+}
+export declare class Scala3TargetLanguage extends TargetLanguage {
+    constructor();
+    protected getOptions(): Option<any>[];
+    get supportsOptionalClassProperties(): boolean;
+    get supportsUnionsWithBothNumberTypes(): boolean;
+    protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
+        [name: string]: any;
+    }): ConvenienceRenderer;
+}