@tim-smart/openapi-gen 0.4.12 → 0.4.14

package/main.js

@@ -34816,6 +34816,24 @@ var toComment = match2({
 */
 `
 });
+var decodeRefTokens = (ref) => {
+  if (!ref) return [];
+  let fragment = ref.startsWith("#") ? ref.slice(1) : ref;
+  if (fragment.startsWith("/")) fragment = fragment.slice(1);
+  if (fragment.length === 0) return [];
+  return fragment.split("/").map((raw) => {
+    let token = raw;
+    try {
+      token = decodeURIComponent(raw);
+    } catch {
+    }
+    return token.replace(/~1/g, "/").replace(/~0/g, "~");
+  });
+};
+var refLastToken = (ref) => {
+  const tokens = decodeRefTokens(ref);
+  return tokens.length > 0 ? tokens[tokens.length - 1] : ref;
+};
 
 // src/JsonSchemaGen.ts
 var make64 = gen2(function* () {
@@ -34824,6 +34842,12 @@ var make64 = gen2(function* () {
   const enums = /* @__PURE__ */ new Set();
   const refStore = /* @__PURE__ */ new Map();
   function cleanupSchema(schema) {
+    if (typeof schema === "boolean") {
+      return schema;
+    }
+    if (typeof schema !== "object" || schema === null) {
+      return schema;
+    }
     if ("type" in schema && Array.isArray(schema.type) && schema.type.includes("null")) {
       const type2 = schema.type.filter((_) => _ !== "null");
       schema = {
@@ -34838,8 +34862,8 @@ var make64 = gen2(function* () {
     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);
+        const baseSchema = omit3(schema, "allOf");
+        schema = mergeSchemas(baseSchema, item);
       } else if ("anyOf" in schema) {
         const item = schema.anyOf[0];
         schema = omit3(schema, "anyOf");
@@ -34857,6 +34881,12 @@ var make64 = gen2(function* () {
     root2 = cleanupSchema(root2);
     function addRefs(schema, childName, asStruct2 = true) {
       schema = cleanupSchema(schema);
+      if (typeof schema === "boolean") {
+        return;
+      }
+      if (typeof schema !== "object" || schema === null) {
+        return;
+      }
       const enumSuffix = childName?.endsWith("Enum") ? "" : "Enum";
       if ("$ref" in schema) {
         if (seenRefs.has(schema.$ref)) {
@@ -34877,7 +34907,7 @@ var make64 = gen2(function* () {
         addRefs(resolved.schema, resolved.name);
         store.set(resolved.name, resolved.schema);
         classes.add(resolved.name);
-      } else if ("properties" in schema) {
+      } else if ("properties" in schema && schema.properties) {
         Object.entries(schema.properties).forEach(
           ([name3, s]) => addRefs(s, childName ? childName + identifier2(name3) : void 0)
         );
@@ -34915,10 +34945,11 @@ var make64 = gen2(function* () {
     }
     if ("$ref" in root2) {
       addRefs(root2, void 0, false);
-      return identifier2(root2.$ref.split("/").pop());
+      return identifier2(refLastToken(root2.$ref));
     } else {
       addRefs(root2, "properties" in root2 ? name2 : void 0);
-      store.set(name2, root2);
+      const resolvedRoot = "allOf" in root2 ? resolveAllOf(root2, { ...root2, ...context7 }) : root2;
+      store.set(name2, resolvedRoot);
       if (!asStruct) {
         classes.add(name2);
       }
@@ -34935,7 +34966,12 @@ var make64 = gen2(function* () {
       isClass,
       isEnum
     });
-    return toSource(importName, schema, name2, topLevel).pipe(
+    return toSource(
+      importName,
+      Object.keys(schema).length ? schema : { properties: {} },
+      name2,
+      topLevel
+    ).pipe(
       map2(
         (source) => transformer.onTopLevel({
           importName,
@@ -34957,7 +34993,7 @@ var make64 = gen2(function* () {
   };
   const flattenAllOf = (schema) => {
     if ("allOf" in schema) {
-      let out = {};
+      let out = omit3(schema, "allOf");
       for (const member of schema.allOf) {
         let s = getSchema(member);
         if ("allOf" in s) {
@@ -34972,6 +35008,16 @@ var make64 = gen2(function* () {
   const transformer = yield* JsonSchemaTransformer;
   const toSource = (importName, schema, currentIdentifier, topLevel = false) => {
     schema = cleanupSchema(schema);
+    if (typeof schema === "boolean") {
+      if (schema === true) {
+        return some2(transformer.onUnknown({ importName }));
+      } else {
+        return none2();
+      }
+    }
+    if (typeof schema !== "object" || schema === null) {
+      return none2();
+    }
     if ("properties" in schema) {
       const obj = schema;
       const required2 = obj.required ?? [];
@@ -35037,7 +35083,7 @@ var make64 = gen2(function* () {
       if (!schema.$ref.startsWith("#")) {
         return none2();
       }
-      const name2 = identifier2(schema.$ref.split("/").pop());
+      const name2 = identifier2(refLastToken(schema.$ref));
       return some2(transformer.onRef({ importName, name: name2 }));
     } else if ("properties" in schema) {
       return toSource(
@@ -35148,6 +35194,8 @@ var make64 = gen2(function* () {
       return { $id: "/schemas/any" };
     } else if (Array.isArray(schema)) {
       return { anyOf: schema };
+    } else if (typeof schema === "boolean") {
+      return schema === false ? { not: {} } : { $id: "/schemas/any" };
     }
     return schema;
   };
@@ -35172,7 +35220,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
     if (options3.isNullable && options3.default === null) {
       return `${S}.optionalWith(${S}.NullOr(${source}), { default: () => null })`;
     }
-    const defaultSource = options3.default !== void 0 && options3.default !== null ? `() => ${JSON.stringify(options3.default)} as const` : void 0;
+    const defaultSource = options3.default !== void 0 && options3.default !== null ? `() => (${JSON.stringify(options3.default)} as const)` : void 0;
     if (options3.isOptional) {
       return defaultSource ? `${S}.optionalWith(${source}, { nullable: true, default: ${defaultSource} })` : `${S}.optionalWith(${source}, { nullable: true })`;
     }
@@ -35273,6 +35321,9 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
     },
     onUnion({ importName, items }) {
       return `${importName}.Union(${items.map((_) => `${toComment(_.description)}${_.source}`).join(",\n")})`;
+    },
+    onUnknown({ importName }) {
+      return `${importName}.Unknown`;
     }
   });
 });
@@ -35330,11 +35381,14 @@ export type ${name2} = (typeof ${name2})[keyof typeof ${name2}];` : `${toComment
       return `{
   ${items.map(({ description, title, source }) => `${toComment(description)}${JSON.stringify(getOrNull(title))}: ${source}`).join(",\n  ")}} as const
 `;
+    },
+    onUnknown() {
+      return "unknown";
     }
   })
 );
 function mergeSchemas(self, other) {
-  if ("properties" in self && "properties" in other) {
+  if ("properties" in self || "properties" in other) {
     return {
       ...other,
       ...self,
@@ -35342,7 +35396,10 @@ function mergeSchemas(self, other) {
         ...other.properties,
         ...self.properties
       },
-      required: [...other.required || [], ...self.required || []]
+      required: [
+        ...other.required || [],
+        ...self.required || []
+      ]
     };
   } else if ("anyOf" in self && "anyOf" in other) {
     return {
@@ -35370,10 +35427,15 @@ function resolveAllOf(schema, context7, resolveRefs = true) {
       if (schema.allOf.length === 0) {
         return out2;
       }
-      Object.assign(out2, schema.allOf[0]);
+      const resolvedMember = resolveAllOf(
+        schema.allOf[0],
+        context7,
+        resolveRefs
+      );
+      out2 = mergeSchemas(out2, resolvedMember);
       return resolveAllOf(out2, context7, resolveRefs);
     }
-    let out = {};
+    let out = omit3(schema, "allOf");
     for (const member of schema.allOf) {
       out = mergeSchemas(out, resolveAllOf(member, context7, resolveRefs));
     }
@@ -35385,7 +35447,7 @@ function resolveRef(schema, context7, recursive = false) {
   if (!schema.$ref.startsWith("#")) {
     return;
   }
-  const path2 = schema.$ref.slice(2).split("/");
+  const path2 = decodeRefTokens(schema.$ref);
   const name2 = identifier2(path2[path2.length - 1]);
   let current = context7;
   for (const key of path2) {
@@ -35466,7 +35528,7 @@ var make65 = gen2(function* () {
       const context7 = { components };
       const operations = [];
       function resolveRef2(ref) {
-        const parts2 = ref.split("/").slice(1);
+        const parts2 = decodeRefTokens(ref);
         let current = spec2;
         for (const part of parts2) {
           current = current[part];

package/package.json

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