Linted imports.

reblocks.asd

@@ -26,7 +26,19 @@
                "reblocks/widgets/funcall-widget"
                "reblocks/utils/clos"
                "reblocks/utils/i18n"
-               "reblocks/preview")
+               "reblocks/preview"
+               ;; We need this because this module defines important method
+               ;; make-js-backend
+               "reblocks/js/jquery"
+               ;; to load js dependencies after app was started
+               "reblocks/app-dependencies"
+               ;; This package defines an :around method for reblocks/widgets:render
+               ;; which adds a wrapper around widget body
+               "reblocks/widgets/render-methods"
+               ;; we need to depend on this package, because
+               ;; lack:builder will try to find `LACK.MIDDLEWARE.SESSION`
+               ;; package
+               "lack-middleware-session")
   :in-order-to ((test-op (test-op "reblocks-test"))))
 
 

src/actions.lisp

@@ -1,6 +1,7 @@
 (uiop:define-package #:reblocks/actions
   (:use #:cl)
-  (:import-from #:log4cl)
+  (:import-from #:log)
+  (:import-from #:reblocks/app-actions)
   (:import-from #:reblocks/utils/misc
                 #:safe-apply)
   (:import-from #:reblocks/variables
@@ -25,7 +26,7 @@
            #:make-js-action
            #:make-js-form-action
            #:make-action-url))
-(in-package reblocks/actions)
+(in-package #:reblocks/actions)
 
 (in-readtable pythonic-string-syntax)
 

src/app-actions.lisp

@@ -6,7 +6,7 @@
    #:add-action
    #:remove-action
    #:define-action))
-(in-package reblocks/app-actions)
+(in-package #:reblocks/app-actions)
 
 ;;
 ;; Permanent actions

src/app-dependencies.lisp

@@ -1,11 +1,12 @@
 (defpackage #:reblocks/app-dependencies
   (:use #:cl)
+  (:import-from #:log)
   (:import-from #:reblocks/dependencies
                 #:get-dependencies)
   (:import-from #:reblocks/app
                 #:get-js-backend
                 #:app))
-(in-package reblocks/app-dependencies)
+(in-package #:reblocks/app-dependencies)
 
 
 (defmethod get-dependencies ((self app))

src/app-mop.lisp

@@ -15,7 +15,7 @@
                           )
   (:export #:get-registered-apps
            #:get-autostarting-apps))
-(in-package reblocks/app-mop)
+(in-package #:reblocks/app-mop)
 
 
 ;; (eval-when (:compile-toplevel :load-toplevel :execute))

src/app.lisp

@@ -1,8 +1,7 @@
 (uiop:define-package #:reblocks/app
   (:use #:cl
         #:f-underscore)
-  (:import-from #:metatilities
-                #:form-symbol)
+  (:import-from #:cl-ppcre)
   (:import-from #:reblocks/app-mop
                 #:get-autostarting-apps
                 #:get-registered-apps
@@ -19,8 +18,6 @@
                 #:remove-keyword-parameters)
   (:import-from #:reblocks/variables
                 #:*current-app*)
-  ;; Just dependencies
-  (:import-from #:log)
   (:export #:defapp
            #:app
            #:get-autostarting-apps
@@ -29,7 +26,7 @@
            #:get-current
            #:with-app
            #:initialize-webapp))
-(in-package reblocks/app)
+(in-package #:reblocks/app)
 
 
 (defclass app ()
@@ -132,14 +129,17 @@ DESCRIPTION - A description of the application for the title page
 
 AUTOSTART - Whether this webapp is started automatically when start-reblocks is
 called (primarily for backward compatibility"
-  `(progn
-     (defclass ,name (,@subclasses app)
-       ,slots
-       (:autostart . ,autostart)
-       (:default-initargs
-        . ,(remove-keyword-parameters
-            initargs :subclasses :slots :autostart))
-       (:metaclass app-class))))
+  (declare (ignore prefix description))
+
+  (let ((default-initargs
+          (remove-keyword-parameters initargs
+                                     :subclasses :slots :autostart)))
+    `(progn
+       (defclass ,name (,@subclasses app)
+         ,slots
+         (:autostart . ,autostart)
+         (:default-initargs ,@default-initargs)
+         (:metaclass app-class)))))
 
 
 (defmethod initialize-instance :after

src/ci.lisp

@@ -5,7 +5,7 @@
   (:import-from #:40ants-ci/jobs/linter)
   (:import-from #:40ants-ci/jobs/run-tests)
   (:import-from #:40ants-ci/jobs/docs))
-(in-package reblocks/ci)
+(in-package #:reblocks/ci)
 
 
 (defworkflow linter

src/commands-hook.lisp

@@ -5,7 +5,7 @@
                 #:call-next-hook)
   (:import-from #:reblocks/commands
                 #:*commands*))
-(in-package reblocks/commands-hook)
+(in-package #:reblocks/commands-hook)
 
 
 (on-application-hook-handle-http-request

src/commands.lisp

@@ -1,8 +1,10 @@
 (defpackage #:reblocks/commands
   (:use #:cl)
+  (:import-from #:alexandria)
+  (:import-from #:parenscript)
   (:export #:add-command
            #:get-collected-commands))
-(in-package reblocks/commands)
+(in-package #:reblocks/commands)
 
 
 (defvar *commands* nil
@@ -15,7 +17,7 @@ as some sort of JSON-rpc calls to be esecuted on a client-side.")
 (defun cl-symbol-to-js-symbol (symbol)
   "A little helper to transform symbols like :foo-baz-bar into keywords :|fooBazBar|."
   (alexandria:make-keyword
-   (ps:symbol-to-js-string symbol)))
+   (parenscript:symbol-to-js-string symbol)))
 
 
 (defun create-command (name &rest args)

src/current-app.lisp

@@ -6,7 +6,7 @@
   (:export
    #:make-uri
    #:get-prefix))
-(in-package reblocks/current-app)
+(in-package #:reblocks/current-app)
 
 
 (defun get-prefix ()

src/debug.lisp

@@ -1,11 +1,12 @@
 (defpackage #:reblocks/debug
   (:use #:cl)
+  (:import-from #:log)
   (:import-from #:reblocks/hooks
                 #:on-application-hook-handle-http-request)
-  (:import-from #:reblocks/app
-                #:*current-app*
-                #:find-app-by-name
-                #:get-registered-apps)
+  ;; (:import-from #:reblocks/app
+  ;;               #:*current-app*
+  ;;               #:find-app-by-name
+  ;;               #:get-registered-apps)
   (:import-from #:reblocks/session
                 #:*session*)
   (:import-from #:reblocks/request
@@ -23,7 +24,7 @@
            #:status
            #:in-app
            #:get-session-value))
-(in-package reblocks/debug)
+(in-package #:reblocks/debug)
 
 
 ;; TODO: move useful staff from debug-mode.lisp, to this package

src/default-init.lisp

@@ -21,7 +21,7 @@
   (:import-from #:reblocks/app
                 #:*current-app*)
   (:export #:welcome-screen-app))
-(in-package reblocks/default-init)
+(in-package #:reblocks/default-init)
 
 
 (defmethod init ((app t))

src/dependencies.lisp

@@ -1,8 +1,13 @@
 (uiop:define-package #:reblocks/dependencies
   (:use #:cl)
+  (:import-from #:cl-ppcre)
+  (:import-from #:cl-fad)
+  (:import-from #:parenscript)
+  (:import-from #:routes)
+  (:import-from #:puri)
   (:import-from #:serapeum
                 #:defvar-unbound)
-  (:import-from #:log4cl)
+  (:import-from #:log)
   (:import-from #:reblocks/utils/misc
                 #:md5)
   (:import-from #:reblocks/html
@@ -13,8 +18,6 @@
                 #:send-script)
   ;; Just a dependency
   (:import-from #:dexador)
-  (:import-from #:alexandria
-                #:make-keyword)
 
   (:export
    #:dependency
@@ -37,7 +40,7 @@
    #:with-collected-dependencies
    #:push-dependency
    #:push-dependencies))
-(in-package reblocks/dependencies)
+(in-package #:reblocks/dependencies)
 
 
 (defvar-unbound *page-dependencies*

src/doc/actions.lisp

@@ -18,7 +18,7 @@
                 #:*ignore-missing-actions*)
   (:import-from #:reblocks/doc/example
                 #:defexample))
-(in-package reblocks/doc/actions)
+(in-package #:reblocks/doc/actions)
 
 
 (in-readtable pythonic-string-syntax)

src/doc/api.lisp

@@ -11,7 +11,7 @@
   (:import-from #:reblocks/variables)
   (:export
    #:@api))
-(in-package reblocks/doc/api)
+(in-package #:reblocks/doc/api)
 
 
 (defsection @api (:title "Unsorted API"

src/doc/app.lisp

@@ -11,7 +11,7 @@
                 #:get-prefix
                 #:initialize-webapp
                 #:with-app))
-(in-package reblocks/doc/app)
+(in-package #:reblocks/doc/app)
 
 
 (defsection @apps (:title "Apps"

src/doc/changelog.lisp

@@ -4,7 +4,7 @@
                 #:in-readtable)
   (:import-from #:pythonic-string-reader
                 #:pythonic-string-syntax))
-(in-package reblocks/doc/changelog)
+(in-package #:reblocks/doc/changelog)
 
 (in-readtable pythonic-string-syntax)
 

src/doc/components.lisp

@@ -5,7 +5,7 @@
   (:import-from #:reblocks/server)
   (:import-from #:reblocks/preview)
   (:export #:@components))
-(in-package reblocks/doc/components)
+(in-package #:reblocks/doc/components)
 
 
 (defsection @components (:title "Components"

src/doc/continuations.lisp

@@ -2,7 +2,7 @@
   (:use #:cl)
   (:import-from #:40ants-doc
                 #:defsection))
-(in-package reblocks/doc/continuations)
+(in-package #:reblocks/doc/continuations)
 
 
 (defsection @continuations (:title "Continuations-based tools")

src/doc/contribute.lisp

@@ -2,7 +2,7 @@
   (:use #:cl)
   (:import-from #:40ants-doc
                 #:defsection))
-(in-package reblocks/doc/contribute)
+(in-package #:reblocks/doc/contribute)
 
 
 (defsection @contribute (:title "Contributing to Reblocks"

src/doc/dependencies.lisp

@@ -6,7 +6,7 @@
                 #:remote-dependency
                 #:dependency
                 #:local-dependency))
-(in-package reblocks/doc/dependencies)
+(in-package #:reblocks/doc/dependencies)
 
 
 (defsection @dependencies (:title "Dependencies"

src/doc/example-server.lisp

@@ -32,7 +32,7 @@
   (:export #:start-server
            #:update-examples
            #:stop-server))
-(in-package reblocks/doc/example-server)
+(in-package #:reblocks/doc/example-server)
 
 
 (defvar *examples* (make-hash-table :test 'equal

src/doc/example.lisp

@@ -21,7 +21,7 @@
            #:update-examples
            #:*server-url*
            #:start-doc-server))
-(in-package reblocks/doc/example)
+(in-package #:reblocks/doc/example)
 
 
 (defvar *server-url* nil

src/doc/forms.lisp

@@ -2,7 +2,7 @@
   (:use #:cl)
   (:import-from #:40ants-doc
                 #:defsection))
-(in-package reblocks/doc/forms)
+(in-package #:reblocks/doc/forms)
 
 
 (defsection @forms (:title "Forms"

src/doc/hooks.lisp

@@ -15,7 +15,7 @@
   (:import-from #:alexandria
                 #:ensure-symbol
                 #:symbolicate))
-(in-package reblocks/doc/hooks)
+(in-package #:reblocks/doc/hooks)
 
 
 (40ants-doc/locatives/base:define-locative-type hook ()

src/doc/index.lisp

@@ -49,7 +49,7 @@
                 #:docs-config)
   (:export #:@index
            #:@readme))
-(in-package reblocks/doc/index)
+(in-package #:reblocks/doc/index)
 
 
 (defsection-copy @index @intro)

src/doc/installation.lisp

@@ -4,7 +4,7 @@
                 #:defsection)
   (:export
    #:@installation))
-(in-package reblocks/doc/installation)
+(in-package #:reblocks/doc/installation)
 
 
 (defsection @installation (:title "Installation"

src/doc/intro.lisp

@@ -4,7 +4,7 @@
                 #:defsection)
   (:export
    #:@intro))
-(in-package reblocks/doc/intro)
+(in-package #:reblocks/doc/intro)
 
 
 (defsection @intro (:title "Introduction"

src/doc/quickstart.lisp

@@ -9,7 +9,7 @@
   (:import-from #:reblocks-ui/form)
   (:import-from #:reblocks/html)
   (:export #:@quickstart))
-(in-package reblocks/doc/quickstart)
+(in-package #:reblocks/doc/quickstart)
 
 
 (defsection @quickstart (:title "Quickstart"

src/doc/rendering.lisp

@@ -8,7 +8,7 @@
   (:import-from #:reblocks/page)
   (:import-from #:40ants-doc
                 #:defsection))
-(in-package reblocks/doc/rendering)
+(in-package #:reblocks/doc/rendering)
 
 
 (in-readtable pythonic-string-syntax)