openapi_generate_typescript_fetch 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c88d2001fe469f8df04f3e11f72debff180b87dbcd66dcf0e9b6f0804a789f7
-  data.tar.gz: 6fcc50af48f8b2b82cfeee034b9aa412def76f031931fc1dc657bc733e856e50
+  metadata.gz: fef98fafb2dd49b75ce82402cae6b4ee62ee057c7373df6fcddec049f2dfe68b
+  data.tar.gz: 3fb16c794e0e3d80782da49c9b3ee43125f78771a462d517bbc653f63e31c14c
 SHA512:
-  metadata.gz: 4897d3b2c4f0c6ef83efa29d801f0282e40611d7f8c7ae867ae1ab7ca7aa370845d88f2fe45036293d69cf9e7b2ee214d4e16745c772e45e0ae172cd695c9a88
-  data.tar.gz: 3237efee6086d9772723d474fa7653d135134ae68a3b4b2cb97b604db02196d92a57b60817eb0e74fd3550f66e55ae334bb789f29c63d79dceb8fffbeeb0c40a
+  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.0'
+  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;
 }
@@ -195,8 +195,7 @@ EOB
     kreq = []
     os.props.select { |p| !p.pattern && !p.additional }.each do |p|
       ps = Gen.h.dereference(p.spec)
-      # oneOf support requires that preq/popt item can be an array of hashes.
-      warn("Property '#{p.name}' type '#{p.type}' has nil schema, fully proicessed source?") if ps.nil?
+      warn("Property '#{p.name}' type '#{p.type}' has nil schema, fully processed source?") if ps.nil?
       o.push("#{p.name}#{p.req ? '' : '?'}: #{p.type};")
       (p.req ? preq : popt).push({
         name: p.name,
@@ -504,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

@@ -70,16 +70,16 @@ sis.each do |si|
     end
     if props.empty? && pat_props.empty? && (add_props.nil? || add_props == false)
       make_name(si.schema, :pass, si.name)
-      out.push("export function #{si.schema[:pass].last}(): #{si.name} { return {} as #{si.name}; }")
+      out.push("export function #{si.schema[:pass].last}(): #{si.name} { return {} as unknown as #{si.name}; }")
       if add_props == false
         make_name(si.schema, :fail, si.name)
-        out.push("export function #{si.schema[:fail].last}(): #{si.name} { return { prop: 'invalid' } as #{si.name}; }")
+        out.push("export function #{si.schema[:fail].last}(): #{si.name} { return { prop: 'invalid' } as unknown as #{si.name}; }")
       end
       next
     end
     unless si.schema.fetch('required', []).empty?
       make_name(si.schema, :fail, si.name)
-      out.push("export function #{si.schema[:fail].last}(): #{si.name} { return {} as #{si.name}; }")
+      out.push("export function #{si.schema[:fail].last}(): #{si.name} { return {} as unknown as #{si.name}; }")
     end
     todo.push(si)
   when 'array'
@@ -122,7 +122,7 @@ sis.each do |si|
     # Handle size-based fails. Any type is ok as length is not within limits.
     if min_items > 1
       make_name(si.schema, :fail, si.name)
-      out.push("export function #{si.schema[:fail].last}(): #{si.name} { const a = []; a[#{min_items - 2}] = 1; return a as #{si.name}; }")
+      out.push("export function #{si.schema[:fail].last}(): #{si.name} { const a = []; a[#{min_items - 2}] = 1; return a as unknown as #{si.name}; }")
     elsif min_items == 1
       make_name(si.schema, :fail, si.name)
       out.push("export function #{si.schema[:fail].last}(): #{si.name} { return [] as #{si.name}; }")
@@ -132,7 +132,7 @@ sis.each do |si|
     end
     unless max_items.nil?
       make_name(si.schema, :fail, si.name)
-      out.push("export function #{si.schema[:fail].last}(): #{si.name} { const a = []; a[#{max_items}] = 0; return a as #{si.name}; }")
+      out.push("export function #{si.schema[:fail].last}(): #{si.name} { const a = []; a[#{max_items}] = 0; return a as unknown as #{si.name}; }")
     end
     todo.push(si)
   when 'string'
@@ -670,11 +670,11 @@ EOB
             if idx < pp.size
               m = other_type([ alts[:prefix][idx], alts[:contains] ].compact)
               make_name(si.schema, :fail, si.name)
-              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return replace(#{ma}, #{idx}, #{m}) as #{si.name}; }")
+              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return replace(#{ma}, #{idx}, #{m}) as unknown as #{si.name}; }")
             else
               m = other_type([ alts[:items], alts[:contains] ].compact)
               make_name(si.schema, :fail, si.name)
-              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return replace(#{ma}, #{idx}, #{m}) as #{si.name}; }")
+              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return replace(#{ma}, #{idx}, #{m}) as unknown as #{si.name}; }")
             end
           end
         end
@@ -685,7 +685,7 @@ EOB
             len = max_contains + 1
             ma = "makeContainingArray(#{min_items}, #{pp}, null, #{alts[:contains][:pass].first}, #{alts[:contains][:is]}, #{len}, #{len})"
             make_name(si.schema, :fail, si.name)
-            out.push("export function #{si.schema[:fail].last}(): #{si.name} { return #{ma} as #{si.name}; }")
+            out.push("export function #{si.schema[:fail].last}(): #{si.name} { return #{ma} as unknown as #{si.name}; }")
             # Exactly max_contains pass, minContains == maxContains == max_contains
             len = max_contains
             ma = "makeContainingArray(#{min_items}, #{pp}, null, #{alts[:contains][:pass].first}, #{alts[:contains][:is]}, #{len}, #{len})"
@@ -700,7 +700,7 @@ EOB
               len = min_contains - 1
               ma = "makeContainingArray(#{min_items}, #{pp}, #{ip}, #{alts[:contains][:pass].first}, #{alts[:contains][:is]}, #{len}, #{len})"
               make_name(si.schema, :fail, si.name)
-              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return #{ma} as #{si.name}; }")
+              out.push("export function #{si.schema[:fail].last}(): #{si.name} { return #{ma} as unknown as #{si.name}; }")
             end
             if min_items <= min_contains + certain_mismatch
               # Min contains pass, minContains == maxContains == min_contains
@@ -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.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ismo Kärkkäinen
@@ -34,6 +34,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
@@ -41,6 +44,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
@@ -49,14 +55,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 description: |-
   This is a processor gem for use with openapi-generate from gem
   openapi-sourcetools.
@@ -106,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Generate Typescript Fetch API client package using OpenAPI format API specification.
 test_files: []