update to latest effect/Schema

glideapps · Oct 24, 2024 · 6470fa3 · 6470fa3
1 parent 29bb816
commit 6470fa3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/...ages/quicktype-core/src/language/TypeScriptEffectSchema/TypeScriptEffectSchemaRenderer.ts b/...ages/quicktype-core/src/language/TypeScriptEffectSchema/TypeScriptEffectSchemaRenderer.ts
@@ -76,12 +76,15 @@ export class TypeScriptEffectSchemaRenderer extends ConvenienceRenderer {
 
     protected emitImports(): void {
         this.ensureBlankLine();
-        this.emitLine(this.importStatement("* as S", '"@effect/schema/Schema"'));
+        this.emitLine(this.importStatement("* as S", '"effect/Schema"'));
     }
 
     private typeMapTypeForProperty(p: ClassProperty): Sourcelike {
-        const typeMap = this.typeMapTypeFor(p.type);
-        return p.isOptional ? ["S.optional(", typeMap, ")"] : typeMap;
+        if (!p.isOptional) {
+            return this.typeMapTypeFor(p.type);
+        }
+
+        return ["S.optional(", this.typeMapTypeFor(p.type), ")"];
     }
 
     private typeMapTypeFor(t: Type, required: boolean = true): Sourcelike {
@@ -104,13 +107,25 @@ export class TypeScriptEffectSchemaRenderer extends ConvenienceRenderer {
             _stringType => "S.String",
             arrayType => ["S.Array(", this.typeMapTypeFor(arrayType.items, false), ")"],
             _classType => panic("Should already be handled."),
-            _mapType => ["S.Record(S.String, ", this.typeMapTypeFor(_mapType.values, false), ")"],
+            _mapType => ["S.Record({ key: S.String, value: ", this.typeMapTypeFor(_mapType.values, false), "})"],
             _enumType => panic("Should already be handled."),
             unionType => {
-                const children = Array.from(unionType.getChildren()).map((type: Type) =>
-                    this.typeMapTypeFor(type, false)
-                );
-                return ["S.Union(", ...arrayIntercalate(", ", children), ")"];
+                const types = Array.from(unionType.getChildren());
+                let children: Sourcelike[] = [];
+                let nullable = false;
+                for (const type of types) {
+                    if (type.kind === "null") {
+                        nullable = true;
+                    } else {
+                        children.push(this.typeMapTypeFor(type, false));
+                    }
+                }
+
+                if (nullable && children.length === 1) {
+                    return ["S.NullOr(", children[0], ")"];
+                }
+
+                return ["S.Union(", ...arrayIntercalate(", ", children), nullable ? ", S.Null)" : ")"];
             },
             _transformedStringType => {
                 return "S.String";

diff --git a/test/fixtures/typescript-effect-schema/main.ts b/test/fixtures/typescript-effect-schema/main.ts
@@ -1,7 +1,7 @@
 import * as TopLevel from "./TopLevel";
 import fs from "fs";
 import process from "process";
-import * as Schema from "@effect/schema/Schema";
+import * as Schema from "effect/Schema";
 
 const sample = process.argv[2];
 const json = fs.readFileSync(sample);

diff --git a/test/fixtures/typescript-effect-schema/package-lock.json b/test/fixtures/typescript-effect-schema/package-lock.json
diff --git a/test/fixtures/typescript-effect-schema/package.json b/test/fixtures/typescript-effect-schema/package.json
@@ -13,6 +13,6 @@
         "typescript": "^5.4.0"
     },
     "dependencies": {
-        "@effect/schema": "^0.66.5"
+        "effect": "^3.10.0"
     }
 }