@tim-smart/openapi-gen 0.4.4 → 0.4.6

package/main.js

@@ -34825,18 +34825,38 @@ var make64 = gen2(function* () {
   const refStore = /* @__PURE__ */ new Map();
   function cleanupSchema(schema) {
     if ("type" in schema && Array.isArray(schema.type) && schema.type.includes("null")) {
-      schema.type = schema.type.filter((_) => _ !== "null")[0];
-      schema.nullable = true;
+      const type2 = schema.type.filter((_) => _ !== "null");
+      schema = {
+        ...schema,
+        type: type2.length === 1 ? type2[0] : type2,
+        nullable: true
+      };
     }
     if ("type" in schema && "oneOf" in schema && Array.isArray(schema.oneOf) && schema.oneOf.length === 0) {
-      delete schema.oneOf;
+      schema = omit3(schema, "oneOf");
+    }
+    if ("allOf" in schema && schema.allOf.length === 1 || "oneOf" in schema && schema.oneOf.length === 1 || "anyOf" in schema && schema.anyOf.length === 1) {
+      if ("allOf" in schema) {
+        const item = schema.allOf[0];
+        schema = omit3(schema, "allOf");
+        Object.assign(schema, item);
+      } else if ("anyOf" in schema) {
+        const item = schema.anyOf[0];
+        schema = omit3(schema, "anyOf");
+        Object.assign(schema, item);
+      } else {
+        const item = schema.oneOf[0];
+        schema = omit3(schema, "oneOf");
+        Object.assign(schema, item);
+      }
     }
     return schema;
   }
   const addSchema = (name2, root2, context7, asStruct = false) => {
-    cleanupSchema(root2);
+    root2 = cleanupSchema(root2);
     function addRefs(schema, childName, asStruct2 = true) {
-      cleanupSchema(schema);
+      schema = cleanupSchema(schema);
+      const enumSuffix = childName?.endsWith("Enum") ? "" : "Enum";
       if ("$ref" in schema) {
         const resolved = resolveRef(schema, {
           ...root2,
@@ -34865,32 +34885,26 @@ var make64 = gen2(function* () {
           addRefs(schema.items, void 0);
         }
       } else if ("allOf" in schema) {
-        if (schema.allOf.length === 1) {
-          const resolved = { ...schema, ...schema.allOf[0] };
-          delete resolved.allOf;
-          addRefs(resolved, childName, asStruct2);
+        const resolved = resolveAllOf(schema, {
+          ...root2,
+          ...context7
+        });
+        if (childName !== void 0) {
+          addRefs(resolved, childName + enumSuffix, asStruct2);
+          store.set(childName, resolved);
         } else {
-          const resolved = resolveAllOf(schema, {
-            ...root2,
-            ...context7
-          });
-          if (childName !== void 0) {
-            addRefs(resolved, childName + "Enum", asStruct2);
-            store.set(childName, resolved);
-          } else {
-            addRefs(resolved, void 0, asStruct2);
-          }
+          addRefs(resolved, void 0, asStruct2);
         }
       } else if ("anyOf" in schema) {
         schema.anyOf.forEach(
-          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+          (s) => addRefs(s, childName ? childName + enumSuffix : void 0)
         );
       } else if ("oneOf" in schema) {
         schema.oneOf.forEach(
-          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+          (s) => addRefs(s, childName ? childName + enumSuffix : void 0)
         );
       } else if ("enum" in schema) {
-        if (childName !== void 0) {
+        if (childName !== void 0 && !("const" in schema)) {
           store.set(childName, schema);
           enums.add(childName);
         }
@@ -34936,7 +34950,7 @@ var make64 = gen2(function* () {
     if ("$ref" in raw) {
       return refStore.get(raw.$ref) ?? raw;
     }
-    return raw;
+    return cleanupSchema(raw);
   };
   const flattenAllOf = (schema) => {
     if ("allOf" in schema) {
@@ -34954,6 +34968,7 @@ var make64 = gen2(function* () {
   };
   const transformer = yield* JsonSchemaTransformer;
   const toSource = (importName, schema, currentIdentifier, topLevel = false) => {
+    schema = cleanupSchema(schema);
     if ("properties" in schema) {
       const obj = schema;
       const required2 = obj.required ?? [];
@@ -34961,6 +34976,7 @@ var make64 = gen2(function* () {
         Object.entries(obj.properties ?? {}),
         filterMap2(([key, schema2]) => {
           const fullSchema = getSchema(schema2);
+          schema2 = cleanupSchema(schema2);
           const isOptional = !required2.includes(key);
           const [enumNullable, filteredSchema] = filterNullable(fullSchema);
           return toSource(
@@ -34990,11 +35006,22 @@ var make64 = gen2(function* () {
       return some2(transformer.onNull({ importName }));
     } else if ("type" in schema && schema.type === "object") {
       return some2(transformer.onRecord({ importName }));
+    } else if ("const" in schema) {
+      return some2(
+        transformer.onEnum({
+          importName,
+          items: [JSON.stringify(schema.const)]
+        })
+      );
     } else if ("enum" in schema) {
       if (!topLevel && enums.has(currentIdentifier)) {
         return some2(
           transformer.onRef({ importName, name: currentIdentifier })
         );
+      } else if (!topLevel && enums.has(currentIdentifier + "Enum")) {
+        return some2(
+          transformer.onRef({ importName, name: currentIdentifier + "Enum" })
+        );
       }
       const items = schema.enum.map((_) => JSON.stringify(_));
       return some2(
@@ -35025,13 +35052,6 @@ var make64 = gen2(function* () {
       const sources = schema.allOf;
       if (sources.length === 0) {
         return none2();
-      } else if (sources.length === 1) {
-        return toSource(
-          importName,
-          sources[0],
-          currentIdentifier + "Enum",
-          topLevel
-        );
       }
       const flattened2 = flattenAllOf(schema);
       return toSource(
@@ -35068,16 +35088,12 @@ var make64 = gen2(function* () {
           )
         )
       );
-      if (items.length === 0) return none2();
-      else if (items.length === 1) return some2(items[0].source);
+      if (items.length === 0) {
+        return none2();
+      } else if (items.length === 1) {
+        return some2(items[0].source);
+      }
       return some2(transformer.onUnion({ importName, items, topLevel }));
-    } else if ("const" in schema) {
-      return some2(
-        transformer.onEnum({
-          importName,
-          items: [JSON.stringify(schema.const)]
-        })
-      );
     } else if ("type" in schema && schema.type) {
       switch (schema.type) {
         case "string": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-smart/openapi-gen",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Generate Effect http clients from OpenAPI specs",
   "bin": "main.js",
   "repository": {