quicktype-typescript-input 23.0.136 → 23.0.138

package/dist/index.js

@@ -46,6 +46,7 @@ const compilerOptions = {
 // FIXME: We're stringifying and then parsing this schema again.  Just pass around
 // the schema directly.
 function schemaForTypeScriptSources(sourceFileNames) {
+    var _a, _b, _c, _d;
     const program = ts.createProgram(sourceFileNames, compilerOptions);
     const diagnostics = ts.getPreEmitDiagnostics(program);
     const error = diagnostics.find(d => d.category === ts.DiagnosticCategory.Error);
@@ -56,7 +57,18 @@ function schemaForTypeScriptSources(sourceFileNames) {
     }
     const schema = (0, typescript_json_schema_1.generateSchema)(program, "*", settings);
     const uris = [];
-    let topLevelName = undefined;
+    let topLevelName = "";
+    // if there is a type that is `export default`, swap the corresponding ref
+    if ((_a = schema === null || schema === void 0 ? void 0 : schema.definitions) === null || _a === void 0 ? void 0 : _a.default) {
+        const defaultDefinition = (_b = schema === null || schema === void 0 ? void 0 : schema.definitions) === null || _b === void 0 ? void 0 : _b.default;
+        const matchingDefaultName = (_d = Object.entries((_c = schema === null || schema === void 0 ? void 0 : schema.definitions) !== null && _c !== void 0 ? _c : {}).find(([_name, definition]) => definition["$ref"] === "#/definitions/default")) === null || _d === void 0 ? void 0 : _d[0];
+        if (matchingDefaultName) {
+            topLevelName = matchingDefaultName;
+            defaultDefinition.title = topLevelName;
+            schema.definitions[matchingDefaultName] = defaultDefinition;
+            schema.definitions.default = { $ref: `#/definitions/${matchingDefaultName}` };
+        }
+    }
     if (schema !== null && typeof schema === "object" && typeof schema.definitions === "object") {
         for (const name of Object.getOwnPropertyNames(schema.definitions)) {
             const definition = schema.definitions[name];
@@ -74,7 +86,7 @@ function schemaForTypeScriptSources(sourceFileNames) {
             const index = (0, quicktype_core_1.defined)(matches.index);
             definition.description = description.slice(0, index) + description.slice(index + matches[0].length);
             uris.push(`#/definitions/${name}`);
-            if (topLevelName === undefined) {
+            if (!topLevelName) {
                 if (typeof definition.title === "string") {
                     topLevelName = definition.title;
                 }
@@ -82,17 +94,11 @@ function schemaForTypeScriptSources(sourceFileNames) {
                     topLevelName = name;
                 }
             }
-            else {
-                topLevelName = "";
-            }
         }
     }
     if (uris.length === 0) {
         uris.push("#/definitions/");
     }
-    if (topLevelName === undefined) {
-        topLevelName = "";
-    }
     return { schema: JSON.stringify(schema), name: topLevelName, uris, isConverted: true };
 }
 exports.schemaForTypeScriptSources = schemaForTypeScriptSources;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quicktype-typescript-input",
-  "version": "23.0.136",
+  "version": "23.0.138",
   "description": "Package for using TypeScript as an input language to quicktype",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -12,7 +12,7 @@
     "tslint": "tslint --project ."
   },
   "dependencies": {
-    "quicktype-core": "23.0.136",
+    "quicktype-core": "23.0.138",
     "typescript": "4.9.5",
     "@mark.probst/typescript-json-schema": "0.55.0"
   },