Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: reorganize symbols #28

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Chore: reorganize symbols #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ For example, this macro call:
Will generate the whole bunch of classes and methods:

```
(defclass petshop (jsonrpc/class:client) nil)
(defclass petshop (jsonrpc/client:client) nil)

(defun make-petshop () (make-instance 'petshop))

Expand Down
80 changes: 49 additions & 31 deletions client/core.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,29 @@
(:import-from #:kebab
#:to-lisp-case)
(:import-from #:log)
(:import-from #:yason)
(:import-from #:jsonrpc/class)
(:import-from #:str)
(:import-from #:dexador)
(:import-from #:closer-mop
#:method-lambda-list
#:method-specializers
#:method-generic-function
#:generic-function-name
#:eql-specializer-object
#:specializer-direct-methods
#:specializer)
(:import-from #:yason
#:parse
#:false)
(:import-from #:jsonrpc/client
#:client)
(:import-from #:jsonrpc/base
#:call)
(:import-from #:str
#:starts-with-p
#:replace-all)
(:import-from #:dexador
#:response-body
#:http-request-internal-server-error)
(:import-from #:alexandria
#:symbolicate
#:length=
#:make-keyword
#:appendf
Expand All @@ -23,18 +41,18 @@
(in-package #:openrpc-client/core)


(declaim (ftype (function (closer-mop:specializer stream) null)
(declaim (ftype (function (specializer stream) null)
generate-method-descriptions))
(defun generate-method-descriptions (class stream)
"Prints method lambda lists wherein a class is used as parameter specializer.
The list is ordered alphabetically and excludes the describe-object method."
(flet ((proper-lambda-list (method)
(let* ((lambda-list (closer-mop:method-lambda-list method))
(specializers (closer-mop:method-specializers method))
(let* ((lambda-list (method-lambda-list method))
(specializers (method-specializers method))
(list-element 0)
(method-name (intern (symbol-name
(closer-mop:generic-function-name
(closer-mop:method-generic-function method)))))
(generic-function-name
(method-generic-function method)))))
(lambda-list-parameters
(mapcar (lambda (element)
(let ((type
Expand All @@ -43,7 +61,7 @@ The list is ordered alphabetically and excludes the describe-object method."
(list (intern (symbol-name element))
(if (string-equal 'eql-specializer
(class-name (class-of type)))
(list 'eql (closer-mop:eql-specializer-object type))
(list 'eql (eql-specializer-object type))
(intern (symbol-name (class-name type)))))
(typecase element
(symbol
Expand All @@ -60,21 +78,21 @@ The list is ordered alphabetically and excludes the describe-object method."
(list method-name)))))))
(format stream "Supported RPC methods:~2%")
(mapc #'proper-lambda-list
(stable-sort (copy-list (closer-mop:specializer-direct-methods class))
(stable-sort (copy-list (specializer-direct-methods class))
(lambda (method1 method2)
(string-lessp (closer-mop:generic-function-name
(closer-mop:method-generic-function method1))
(closer-mop:generic-function-name
(closer-mop:method-generic-function method2))))))
(string-lessp (generic-function-name
(method-generic-function method1))
(generic-function-name
(method-generic-function method2))))))
nil))

(eval-when (:compile-toplevel :load-toplevel :execute)
(declaim (ftype (function (symbol &key (:export-symbols boolean))
cons)
generate-client-class))
(defun generate-client-class (class-name &key export-symbols)
(let* ((make-func-name (alexandria:symbolicate "MAKE-" class-name))
(result `((defclass ,class-name (jsonrpc/class:client)
(let* ((make-func-name (symbolicate "MAKE-" class-name))
(result `((defclass ,class-name (client)
())
(defun ,make-func-name ()
(make-instance ',class-name))
Expand All @@ -89,7 +107,7 @@ The list is ordered alphabetically and excludes the describe-object method."
(defun normalize-name (string)
(string-upcase
(to-lisp-case
(str:replace-all "." "-" string))))
(replace-all "." "-" string))))

(declaim (ftype (function (hash-table) cons) schema-to-type))
(defun schema-to-type (schema)
Expand All @@ -105,7 +123,7 @@ The list is ordered alphabetically and excludes the describe-object method."
(push 'integer type-list))
((string-equal type "string") (push 'string type-list))
((string-equal type "boolean")
(push '(eql yason:false) type-list)
(push '(eql false) type-list)
(push '(eql t) type-list))
((string-equal type "object") (push 'hash-table type-list))
((string-equal type "array") (push 'list type-list))
Expand Down Expand Up @@ -186,7 +204,7 @@ The list is ordered alphabetically and excludes the describe-object method."
for name = (intern (normalize-name
(gethash "name" param)))
for default = nil
for given-name = (alexandria:symbolicate name "-GIVEN-P")
for given-name = (symbolicate name "-GIVEN-P")
collect (list name default given-name))))))
(declare (list required-parameter keyword-parameter))
(return (if required-parameter
Expand Down Expand Up @@ -216,23 +234,23 @@ The list is ordered alphabetically and excludes the describe-object method."
,@(loop for param in keyword-params
for original-name = (gethash "name" param)
for name = (intern (normalize-name original-name))
for given-name = (alexandria:symbolicate name "-GIVEN-P")
for given-name = (symbolicate name "-GIVEN-P")
collect `(when ,given-name
(setf (gethash ,original-name args)
,name)))
;; Returning the dictionary with all given arguments
args))))

(defun get-or-create-class (x-cl-class schema classes-cache &key export-symbols)
(let* ((class-name (alexandria:symbolicate (string-upcase x-cl-class)))
(let* ((class-name (symbolicate (string-upcase x-cl-class)))
(existing-code (gethash class-name classes-cache)))
(unless existing-code
(loop with properties = (gethash "properties" schema)
for name being the hash-key of properties
for name-symbol = (alexandria:symbolicate (string-upcase
for name-symbol = (symbolicate (string-upcase
(to-lisp-case name)))
for name-keyword = (alexandria:make-keyword name-symbol)
for reader-func = (alexandria:symbolicate class-name
for name-keyword = (make-keyword name-symbol)
for reader-func = (symbolicate class-name
"-"
name-symbol)
collect `(export ',reader-func) into slot-reader-exports
Expand Down Expand Up @@ -431,23 +449,23 @@ lambda-list a separate defmethod."
path))))

(defun retrieve-spec (url-or-path)
(yason:parse
(parse
(etypecase url-or-path
(pathname (retrieve-data-from-path url-or-path))
(string
(cond
((str:starts-with-p "http" url-or-path)
((starts-with-p "http" url-or-path)
(retrieve-data-from-url url-or-path))
(t
(retrieve-data-from-path url-or-path))))))))


(defgeneric rpc-call (client func-name arguments)
(:method ((client t) func-name (arguments t))
(handler-bind ((dexador.error:http-request-internal-server-error
(handler-bind ((http-request-internal-server-error
(lambda (condition)
(let* ((body (dex:response-body condition))
(response (yason:parse body))
(let* ((body (response-body condition))
(response (parse body))
(error (gethash "error" response))
(code (gethash "code" error))
(message (gethash "message" error)))
Expand All @@ -459,7 +477,7 @@ lambda-list a separate defmethod."
:message message
:func-name func-name
:func-arguments arguments)))))
(jsonrpc/class:call client func-name arguments))))
(call client func-name arguments))))


(eval-when (:compile-toplevel :load-toplevel :execute)
Expand Down
2 changes: 1 addition & 1 deletion client/docs.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Will generate the whole bunch of classes and methods:


```
(defclass petshop (jsonrpc/class:client) nil)
(defclass petshop (jsonrpc/client:client) nil)

(defun make-petshop () (make-instance 'petshop))

Expand Down
2 changes: 1 addition & 1 deletion server/clack.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(:import-from #:jsonrpc)
(:import-from #:yason)
(:import-from #:lack.request)
(:import-from #:jsonrpc/class
(:import-from #:jsonrpc/server
#:bind-server-to-transport)
(:import-from #:jsonrpc/transport/websocket
#:websocket-transport)
Expand Down
2 changes: 1 addition & 1 deletion t/client/regress-data/multiple-types/client-class.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
((defclass the-class (jsonrpc/class:client) nil)
((defclass the-class (jsonrpc/client:client) nil)
(defun make-the-class () (make-instance 'the-class))
(defmethod describe-object ((openrpc-client/core::client the-class) stream)
(openrpc-client/core::generate-method-descriptions
Expand Down
Loading