Implement RFC-391 (#18585)
This commit is contained in:
parent
cc08d5c2c6
commit
e65dc36ddd
3 changed files with 89 additions and 91 deletions
|
|
@ -1,14 +1,13 @@
|
||||||
## - Fetch for the JavaScript target: https://developer.mozilla.org/docs/Web/API/Fetch_API
|
## - Fetch for the JavaScript target: https://developer.mozilla.org/docs/Web/API/Fetch_API
|
||||||
## .. Note:: jsfetch is Experimental. jsfetch module requires `-d:nimExperimentalJsfetch`
|
## .. Note:: jsfetch is Experimental.
|
||||||
when not defined(js):
|
when not defined(js):
|
||||||
{.fatal: "Module jsfetch is designed to be used with the JavaScript backend.".}
|
{.fatal: "Module jsfetch is designed to be used with the JavaScript backend.".}
|
||||||
|
|
||||||
when defined(nimExperimentalJsfetch):
|
import std/[asyncjs, jsheaders, jsformdata]
|
||||||
import std/[asyncjs, jsheaders, jsformdata]
|
from std/httpcore import HttpMethod
|
||||||
from std/httpcore import HttpMethod
|
from std/jsffi import JsObject
|
||||||
from std/jsffi import JsObject
|
|
||||||
|
|
||||||
type
|
type
|
||||||
FetchOptions* = ref object of JsRoot ## Options for Fetch API.
|
FetchOptions* = ref object of JsRoot ## Options for Fetch API.
|
||||||
keepalive*: bool
|
keepalive*: bool
|
||||||
metod* {.importjs: "method".}: cstring
|
metod* {.importjs: "method".}: cstring
|
||||||
|
|
@ -63,30 +62,30 @@ when defined(nimExperimentalJsfetch):
|
||||||
body*: Body
|
body*: Body
|
||||||
|
|
||||||
|
|
||||||
func newResponse*(body: cstring | FormData): Response {.importjs: "(new Response(#))".}
|
func newResponse*(body: cstring | FormData): Response {.importjs: "(new Response(#))".}
|
||||||
## Constructor for `Response`. This does *not* call `fetch()`. Same as `new Response()`.
|
## Constructor for `Response`. This does *not* call `fetch()`. Same as `new Response()`.
|
||||||
|
|
||||||
func newRequest*(url: cstring): Request {.importjs: "(new Request(#))".}
|
func newRequest*(url: cstring): Request {.importjs: "(new Request(#))".}
|
||||||
## Constructor for `Request`. This does *not* call `fetch()`. Same as `new Request()`.
|
## Constructor for `Request`. This does *not* call `fetch()`. Same as `new Request()`.
|
||||||
|
|
||||||
func clone*(self: Response | Request): Response {.importjs: "#.$1()".}
|
func clone*(self: Response | Request): Response {.importjs: "#.$1()".}
|
||||||
## https://developer.mozilla.org/en-US/docs/Web/API/Response/clone
|
## https://developer.mozilla.org/en-US/docs/Web/API/Response/clone
|
||||||
|
|
||||||
proc text*(self: Response): Future[cstring] {.importjs: "#.$1()".}
|
proc text*(self: Response): Future[cstring] {.importjs: "#.$1()".}
|
||||||
## https://developer.mozilla.org/en-US/docs/Web/API/Body/text
|
## https://developer.mozilla.org/en-US/docs/Web/API/Body/text
|
||||||
|
|
||||||
proc json*(self: Response): Future[JsObject] {.importjs: "#.$1()".}
|
proc json*(self: Response): Future[JsObject] {.importjs: "#.$1()".}
|
||||||
## https://developer.mozilla.org/en-US/docs/Web/API/Body/json
|
## https://developer.mozilla.org/en-US/docs/Web/API/Body/json
|
||||||
|
|
||||||
proc formData*(self: Body): Future[FormData] {.importjs: "#.$1()".}
|
proc formData*(self: Body): Future[FormData] {.importjs: "#.$1()".}
|
||||||
## https://developer.mozilla.org/en-US/docs/Web/API/Body/formData
|
## https://developer.mozilla.org/en-US/docs/Web/API/Body/formData
|
||||||
|
|
||||||
proc unsafeNewFetchOptions*(metod, body, mode, credentials, cache, referrerPolicy: cstring;
|
proc unsafeNewFetchOptions*(metod, body, mode, credentials, cache, referrerPolicy: cstring;
|
||||||
keepalive: bool; redirect = "follow".cstring; referrer = "client".cstring; integrity = "".cstring): FetchOptions {.importjs:
|
keepalive: bool; redirect = "follow".cstring; referrer = "client".cstring; integrity = "".cstring): FetchOptions {.importjs:
|
||||||
"{method: #, body: #, mode: #, credentials: #, cache: #, referrerPolicy: #, keepalive: #, redirect: #, referrer: #, integrity: #}".}
|
"{method: #, body: #, mode: #, credentials: #, cache: #, referrerPolicy: #, keepalive: #, redirect: #, referrer: #, integrity: #}".}
|
||||||
## .. warning:: Unsafe `newfetchOptions`.
|
## .. warning:: Unsafe `newfetchOptions`.
|
||||||
|
|
||||||
func newfetchOptions*(metod: HttpMethod; body: cstring;
|
func newfetchOptions*(metod: HttpMethod; body: cstring;
|
||||||
mode: FetchModes; credentials: FetchCredentials; cache: FetchCaches; referrerPolicy: FetchReferrerPolicies;
|
mode: FetchModes; credentials: FetchCredentials; cache: FetchCaches; referrerPolicy: FetchReferrerPolicies;
|
||||||
keepalive: bool; redirect = frFollow; referrer = "client".cstring; integrity = "".cstring): FetchOptions =
|
keepalive: bool; redirect = frFollow; referrer = "client".cstring; integrity = "".cstring): FetchOptions =
|
||||||
## Constructor for `FetchOptions`.
|
## Constructor for `FetchOptions`.
|
||||||
|
|
@ -104,18 +103,18 @@ when defined(nimExperimentalJsfetch):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
proc fetch*(url: cstring | Request): Future[Response] {.importjs: "$1(#)".}
|
proc fetch*(url: cstring | Request): Future[Response] {.importjs: "$1(#)".}
|
||||||
## `fetch()` API, simple `GET` only, returns a `Future[Response]`.
|
## `fetch()` API, simple `GET` only, returns a `Future[Response]`.
|
||||||
|
|
||||||
proc fetch*(url: cstring | Request; options: FetchOptions): Future[Response] {.importjs: "$1(#, #)".}
|
proc fetch*(url: cstring | Request; options: FetchOptions): Future[Response] {.importjs: "$1(#, #)".}
|
||||||
## `fetch()` API that takes a `FetchOptions`, returns a `Future[Response]`.
|
## `fetch()` API that takes a `FetchOptions`, returns a `Future[Response]`.
|
||||||
|
|
||||||
func toCstring*(self: Request | Response | Body | FetchOptions): cstring {.importjs: "JSON.stringify(#)".}
|
func toCstring*(self: Request | Response | Body | FetchOptions): cstring {.importjs: "JSON.stringify(#)".}
|
||||||
|
|
||||||
func `$`*(self: Request | Response | Body | FetchOptions): string = $toCstring(self)
|
func `$`*(self: Request | Response | Body | FetchOptions): string = $toCstring(self)
|
||||||
|
|
||||||
|
|
||||||
runnableExamples("-d:nimExperimentalJsfetch -r:off"):
|
runnableExamples("-r:off"):
|
||||||
import std/[asyncjs, jsconsole, jsheaders, jsformdata]
|
import std/[asyncjs, jsconsole, jsheaders, jsformdata]
|
||||||
from std/httpcore import HttpMethod
|
from std/httpcore import HttpMethod
|
||||||
from std/jsffi import JsObject
|
from std/jsffi import JsObject
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ hint("Processing", off)
|
||||||
# experimental API's are enabled in testament, refs https://github.com/timotheecour/Nim/issues/575
|
# experimental API's are enabled in testament, refs https://github.com/timotheecour/Nim/issues/575
|
||||||
# sync with `kochdocs.docDefines` or refactor.
|
# sync with `kochdocs.docDefines` or refactor.
|
||||||
switch("define", "nimExperimentalAsyncjsThen")
|
switch("define", "nimExperimentalAsyncjsThen")
|
||||||
switch("define", "nimExperimentalJsfetch")
|
|
||||||
switch("define", "nimExperimentalLinenoiseExtra")
|
switch("define", "nimExperimentalLinenoiseExtra")
|
||||||
|
|
||||||
switch("define", "nimPreviewFloatRoundtrip")
|
switch("define", "nimPreviewFloatRoundtrip")
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ const
|
||||||
gaCode* = " --doc.googleAnalytics:UA-48159761-1"
|
gaCode* = " --doc.googleAnalytics:UA-48159761-1"
|
||||||
# errormax: subsequent errors are probably consequences of 1st one; a simple
|
# errormax: subsequent errors are probably consequences of 1st one; a simple
|
||||||
# bug could cause unlimited number of errors otherwise, hard to debug in CI.
|
# bug could cause unlimited number of errors otherwise, hard to debug in CI.
|
||||||
docDefines = "-d:nimExperimentalAsyncjsThen -d:nimExperimentalJsfetch -d:nimExperimentalLinenoiseExtra"
|
docDefines = "-d:nimExperimentalAsyncjsThen -d:nimExperimentalLinenoiseExtra"
|
||||||
nimArgs = "--errormax:3 --hint:Conf:off --hint:Path:off --hint:Processing:off --hint:XDeclaredButNotUsed:off --warning:UnusedImport:off -d:boot --putenv:nimversion=$# $#" % [system.NimVersion, docDefines]
|
nimArgs = "--errormax:3 --hint:Conf:off --hint:Path:off --hint:Processing:off --hint:XDeclaredButNotUsed:off --warning:UnusedImport:off -d:boot --putenv:nimversion=$# $#" % [system.NimVersion, docDefines]
|
||||||
gitUrl = "https://github.com/nim-lang/Nim"
|
gitUrl = "https://github.com/nim-lang/Nim"
|
||||||
docHtmlOutput = "doc/html"
|
docHtmlOutput = "doc/html"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue