Stop json schema from crashing on unknown scalar (microsoft#4150)

fix microsoft#4096
weidongxu-microsoft · Sep 3, 2024 · e92e26f · e92e26f
1 parent 02ed0ba
commit e92e26f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.chronus/changes/fix-json-schema-crash-unknown-scalar-2024-7-12-22-23-57.md b/.chronus/changes/fix-json-schema-crash-unknown-scalar-2024-7-12-22-23-57.md
@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/json-schema"
+---
+
+Stop json schema from crashing on unknown scalar and handle `unixTimestamp32`
diff --git a/packages/json-schema/src/json-schema-emitter.ts b/packages/json-schema/src/json-schema-emitter.ts
@@ -476,6 +476,7 @@ export class JsonSchemaEmitter extends TypeEmitter<Record<string, any>, JSONSche
       case "int16":
         return { type: "integer", minimum: -32768, maximum: 32767 };
       case "int32":
+      case "unixTimestamp32":
         return { type: "integer", minimum: -2147483648, maximum: 2147483647 };
       case "int64":
         const int64Strategy = this.emitter.getOptions()["int64-strategy"] ?? "string";
@@ -529,7 +530,12 @@ export class JsonSchemaEmitter extends TypeEmitter<Record<string, any>, JSONSche
       case "bytes":
         return { type: "string", contentEncoding: "base64" };
       default:
-        compilerAssert(false, `Unknown built-in scalar type ${baseBuiltIn.name}`);
+        reportDiagnostic(this.emitter.getProgram(), {
+          code: "unknown-scalar",
+          format: { name: baseBuiltIn.name },
+          target: baseBuiltIn,
+        });
+        return {};
     }
   }
 

diff --git a/packages/json-schema/test/built-ins.test.ts b/packages/json-schema/test/built-ins.test.ts
@@ -13,6 +13,7 @@ describe("emitting built-in types", () => {
     ["int8", { type: "integer", minimum: -128, maximum: 127 }],
     ["int16", { type: "integer", minimum: -32768, maximum: 32767 }],
     ["int32", { type: "integer", minimum: -2147483648, maximum: 2147483647 }],
+    ["unixTimestamp32", { type: "integer", minimum: -2147483648, maximum: 2147483647 }],
     ["int64", { type: "string" }],
     ["uint8", { type: "integer", minimum: 0, maximum: 255 }],
     ["uint16", { type: "integer", minimum: 0, maximum: 65535 }],