openapi_generate_typescript_fetch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a710b6a9f35f73cad9298c8ac2b0e215bbd6a5cf274ef150c86384b1069a925
-  data.tar.gz: ff177ebf3cfc367f171da4648a782e3a9628840e03b2d93991fbb427911f471b
+  metadata.gz: fef98fafb2dd49b75ce82402cae6b4ee62ee057c7373df6fcddec049f2dfe68b
+  data.tar.gz: 3fb16c794e0e3d80782da49c9b3ee43125f78771a462d517bbc653f63e31c14c
 SHA512:
-  metadata.gz: 2b397bb7657311db7440328d047088676ae04d717352e7d2baab395f81fb4cc58da442eeb70f41284adb97485d25334bd1d6dd3ecc02b7e05f72e1450b8d0638
-  data.tar.gz: 4719d60d7973a50d00fd23e49389f6871a5daf2e2787f8e13e98731683ee267b652edc0805060bfa199e0e58d68bcc55ed7e71288543f9062ddd70c7f512eba9
+  metadata.gz: 14f13f53771fce068e664cfb01538fede08f8b6b100117cdca9d88b18118ec5e3a267cf3ca30c992dad5bc18cea4952a99f5073ca2f4b82cbd9fc1c8c3459dc3
+  data.tar.gz: b15055c459a498fcdd2da933f2d58a59d16cded49098f599575cf06419916e100b317b8ca2f3c8fb2e1a2e31946ed55e0898a141f9a012e0d9c5f7ba5a14941c

data/lib/openapi_generate_typescript_fetch/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright © 2025 Ismo Kärkkäinen
+# Copyright © 2025-2026 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 module OpenAPIGenerateTypeScriptFetch
   NAME = 'openapi_generate_typescript_fetch'
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/template/src/callclasses.ts.erb

@@ -236,7 +236,7 @@ EOB
     end
     query_params = ps.select { |p| p['in'] == 'query' }
     query_func = query_params.map { |qp|
-      "if (cand.#{qp[:name]} !== undefined) q.push(`#{URI.encode_uri_component(qp['name'])})=${encodeURIComponent(cand.#{qp[:name]})}`);"
+      "if (cand.#{qp[:name]} !== undefined) q.push(`#{URI.encode_uri_component(qp['name'])}=${encodeURIComponent(cand.#{qp[:name]})}`);"
     }.join("\n")
     header_params = ps.select { |p| p['in'] == 'header' }
     header_func = header_params.map { |hp|
@@ -439,6 +439,8 @@ export class #{clsName} {
 
     #{encode}
     prepare({ ignoreMismatches = false, createAbortSignal = false }: PrepareArgs = {}): UrlRequestInit {
+        if (this.urlRequestInit !== undefined)
+            return this.urlRequestInit;
         const cand = #{paramless ? '{}' : "{ ...#{operation_object[:shared]}(), ...#{clsName}.params, ...this.params! }"};
         #{paramless ? '// cand is ok.' : "
         if (!#{operation_object[:args_is]}(cand) && !ignoreMismatches) {
@@ -462,9 +464,11 @@ export class #{clsName} {
         return out;
     }
 
-    async call(): Promise<#{clsRespName}> {
-        const ur = this.urlRequestInit || this.prepare();
-        return #{clsRespName}.obtain({ caller: this });
+    // args gets passed through to #{clsRespName}.obtain.
+    async call(args: Partial<#{clsRespName}Args> = {}): Promise<#{clsRespName}> {
+        if (this.urlRequestInit === undefined)
+            this.prepare();
+        return #{clsRespName}.obtain({ caller: this, ...args });
     }
 }
 
@@ -500,6 +504,7 @@ export class #{clsRespName} {
 
     static async obtain(args: #{clsRespName}Args): Promise<#{clsRespName}> {
         if (args.response === undefined) {
+            args.caller.prepare();
             args.response = await fetch(args.caller.urlRequestInit!.url, args.caller.urlRequestInit!.ri);
         }
         args = { loaders: #{clsRespName}.loaders, ...#{clsRespName}.args, ...args };

data/template/src/schemas.ts.erb

@@ -77,7 +77,7 @@ export function baseArray(a: Array<any>): Array<any> {
     else if (isObject(x))
       out.push(baseObject(x as object));
     else
-      out.push(x); // Boolean, string, number, null, or undefined maybe.
+      out.push(x); // Scalar or undefined.
   }
   return out;
 }
@@ -503,7 +503,15 @@ export function #{si.schema[:base]}(x: #{si.name}): #{si.name} {
 EOB
     out.push(s)
   else
-    raise StandardError, "Unhandled type: '#{si.schema['type']}' in #{si.name}"
+    ref = si.schema['$ref']
+    raise StandardError, "Unhandled type: '#{si.schema['type']}' in #{si.name}" if ref.nil?
+    Gen.x.schemas.types.push(si.name)
+    r = Gen.h.dereference(ref)
+    si.schema[:is] = r[:is]
+    si.schema[:unknown] = r[:unknown]
+    si.schema[:base] = r[:base]
+    si.schema[:checkers] = r[:checkers]
+    out.push("export type #{si.name} = #{r[:name]};")
   end
   out.push('')
 end

data/template/test/makers.ts.erb

@@ -751,7 +751,9 @@ Gen.doc['paths'].each do |path, path_item_object|
     end
     paraschemas = operation_object[:paraschemas]
     commons = {}
-    [ :pass, :fail, :typefail, 'missing' ].each do |kind|
+    categories = [ :pass, :fail, :typefail ]
+    categories.push('missing') unless paraschemas.index { |ps| ps[:param]['required'] }.nil?
+    categories.each do |kind|
       paraschemas.size.times do |chosen|
         param_makers = []
         category = kind
@@ -768,6 +770,8 @@ Gen.doc['paths'].each do |path, path_item_object|
                 needed = :fail unless schema[:fail].empty?
                 category = needed
               else
+                needed = :pass # Optional missing is not a problem.
+                category = needed
                 param_makers.push(nil)
                 next
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openapi_generate_typescript_fetch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ismo Kärkkäinen