render

pollen/private/ts.rktd

@@ -1 +1 @@
-1540858363
+1540858366

pollen/render.rkt

@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/file
          racket/path
-         compiler/cm
+         racket/match
          sugar/test
          sugar/define
          sugar/file
@@ -12,7 +12,6 @@
          "private/project.rkt"
          "private/cache-utils.rkt"
          "pagetree.rkt"
-         "template.rkt"
          "core.rkt"
          "setup.rkt")
 
@@ -23,7 +22,6 @@
 ;; render functions will always go when no mod-date is found.
 (define (reset-mod-date-hash!) (set! mod-date-hash (make-hash)))
 
-
 (module-test-internal
  (require racket/runtime-path)
  (define-runtime-path sample-dir "test/data/samples")
@@ -31,8 +29,6 @@
                    (map path->complete-path (filter (λ (name) (regexp-match "sample-" name)) (directory-list ".")))))
  (define-values (sample-01 sample-02 sample-03) (apply values samples)))
 
-
-
 ;; each key for mod-date-hash is a list of file / mod-date pairs (using pollen/cache keymaking function)
 ;; when a file is rendered, a new key is stored in the hash (with trivial value #t)
 ;; after that, the hash-key-comparision routine intrinsic to hash lookup
@@ -40,15 +36,13 @@
 ;; create a new key with current files. If the key is in the hash, the render has happened.
 ;; if not, a new render is needed.
 (define (update-mod-date-hash! source-path template-path)
-  (hash-set! mod-date-hash (paths->key source-path template-path) #t))
+  (hash-set! mod-date-hash (paths->key source-path template-path) #true))
 
 (define (mod-date-missing-or-changed? source-path template-path)
   (not (hash-has-key? mod-date-hash (paths->key source-path template-path))))
 
-
 (define (list-of-pathish? x) (and (list? x) (andmap pathish? x)))
 
-
 (define+provide/contract (render-batch . xs)
   (() #:rest list-of-pathish? . ->* . void?)
   ;; Why not just (for-each render ...)?
@@ -58,7 +52,6 @@
   (reset-mod-date-hash!) 
   (for-each render-from-source-or-output-path xs))
 
-
 (define+provide/contract (render-pagenodes pagetree-or-path)
   ((or/c pagetree? pathish?) . -> . void?)
   (define pagetree (if (pagetree? pagetree-or-path)
@@ -67,7 +60,6 @@
   (parameterize ([current-directory (current-project-root)])
     (apply render-batch (map ->complete-path (pagetree->list pagetree)))))
 
-
 (define+provide/contract (render-from-source-or-output-path so-pathish)
   (pathish? . -> . void?)
   (define so-path (->complete-path so-pathish)) ; so-path = source or output path (could be either) 
@@ -77,7 +69,7 @@
                                    has/is-markup-source?
                                    has/is-scribble-source?
                                    has/is-markdown-source?))])
-       (pred so-path))
+             (pred so-path))
      (define-values (source-path output-path) (->source+output-paths so-path))
      (render-to-file-if-needed source-path #f output-path)]
     [(pagetree-source? so-path) (render-pagenodes so-path)])
@@ -101,7 +93,7 @@
       [(not (file-exists? output-path)) 'file-missing]
       [(mod-date-missing-or-changed? source-path template-path) 'mod-key-missing-or-changed]
       [(not (setup:render-cache-active source-path)) 'render-cache-deactivated]
-      [else #f]))
+      [else #false]))
   (when render-needed?
     (define render-result
       (let ([key (paths->key source-path template-path output-path)])
@@ -121,17 +113,14 @@
                      #:exists 'replace
                      #:mode (if (string? render-result) 'text 'binary))))
 
-
 (define+provide/contract (render-to-file-if-needed source-path [maybe-template-path #f] [maybe-output-path #f])
   ((complete-path?) ((or/c #f complete-path?) (or/c #f complete-path?)) . ->* . void?)
   (render-to-file-base 'render-to-file-if-needed #f source-path maybe-output-path maybe-template-path))
 
-
 (define+provide/contract (render-to-file source-path [maybe-template-path #f] [maybe-output-path #f])
   ((complete-path?) ((or/c #f complete-path?) (or/c #f complete-path?)) . ->* . void?)
   (render-to-file-base 'render-to-file #t source-path maybe-output-path maybe-template-path))
 
-
 (define+provide/contract (render source-path [maybe-template-path #f] [maybe-output-path #f])
   ((complete-path?) ((or/c #f complete-path?) (or/c #f complete-path?)) . ->* . (or/c string? bytes?))
   (define output-path (or maybe-output-path (->output-path source-path)))
@@ -151,7 +140,7 @@
   (define render-proc (for/first ([test (in-list tests)]
                                   [render-proc (in-list render-procs)]
                                   #:when (test source-path))
-                        render-proc))
+                                 render-proc))
   (unless render-proc
     (raise-argument-error 'render (format "valid rendering function for ~a" source-path) render-proc))
   
@@ -169,14 +158,12 @@
   (update-mod-date-hash! source-path template-path) 
   render-result)
 
-
 (define (render-null-source source-path . ignored-paths)
   ;((complete-path?) #:rest any/c . ->* . bytes?)
   ;; All this does is copy the source. Hence, "null".
   ;; todo: add test to avoid copying if unnecessary (good idea in case the file is large)
   (file->bytes source-path))
 
-
 (define (render-scribble-source source-path . _)
   ;((complete-path?) #:rest any/c . ->* . string?)
   (local-require scribble/core scribble/manual (prefix-in scribble- scribble/render))
@@ -184,30 +171,27 @@
   ;; make fresh namespace for scribble rendering (avoids dep/zo caching)
   (time (parameterize ([current-namespace (make-base-namespace)]
                        [current-directory (->complete-path source-dir)])
-          (namespace-attach-module (namespace-anchor->namespace render-module-ns) 'scribble/core)
+          (define ns (namespace-anchor->namespace render-module-ns))
-          (namespace-attach-module (namespace-anchor->namespace render-module-ns) 'scribble/manual)
+          (namespace-attach-module ns 'scribble/core (current-namespace))
-          
+          (namespace-attach-module ns 'scribble/manual (current-namespace))
           ;; scribble/lp files have their doc export in a 'doc submodule, so check both locations
-          (define doc
+          (match (cond
-            [cond
+                   [(dynamic-require source-path 'doc (λ () #false))]
-              [(dynamic-require source-path 'doc (λ () #f))]
+                   [(dynamic-require `(submod ,source-path doc) 'doc (λ () #false))]
-              [(dynamic-require `(submod ,source-path doc) 'doc (λ () #f))]
+                   [else #false])
-              [else #f]])
+            ;; BTW this next action has side effects: scribble will copy in its core files if they don't exist.
-          ;; BTW this next action has side effects: scribble will copy in its core files if they don't exist.
+            [(? part? doc) (scribble-render (list doc) (list source-path))]
-          (when doc
+            [_ (void)])))
-            (scribble-render (list doc) (list source-path)))))
+  (begin0 ; because render promises the data, not the side effect
-  (define result (file->string (->output-path source-path)))
+    (file->string (->output-path source-path))
-  (delete-file (->output-path source-path)) ; because render promises the data, not the side effect
+    (delete-file (->output-path source-path))))
-  result)
-
 
 (define (render-preproc-source source-path . _)
   (time (parameterize ([current-directory (->complete-path (dirname source-path))])
-          (render-through-eval (syntax->datum
+          (render-datum-through-eval (syntax->datum
-                                (with-syntax ([SOURCE-PATH source-path])
+                                      (with-syntax ([SOURCE-PATH source-path])
-                                  #'(begin (require pollen/cache)
+                                        #'(begin (require pollen/cache)
-                                           (cached-doc SOURCE-PATH))))))))
+                                                 (cached-doc SOURCE-PATH))))))))
-
 
 (define (render-markup-or-markdown-source source-path [maybe-template-path #f] [maybe-output-path #f])
   (define output-path (or maybe-output-path (->output-path source-path)))
@@ -217,7 +201,7 @@
   (unless template-path
     (raise-argument-error 'render-markup-or-markdown-source "valid template path" template-path))
   (render-from-source-or-output-path template-path) ; because template might have its own preprocessor source
-  (define expr-to-eval
+  (define datum-to-eval
     (syntax->datum
      (with-syntax ([DIRECTORY-REQUIRE-FILES (require-directory-require-files source-path)]
                    [DOC-ID (setup:main-export source-path)]
@@ -246,52 +230,46 @@
                  (include-template #:command-char COMMAND-CHAR (file TEMPLATE-PATH))))))))
   ;; set current-directory because include-template wants to work relative to source location
   (time (parameterize ([current-directory (->complete-path (dirname source-path))]) 
-          (render-through-eval expr-to-eval))))
+          (render-datum-through-eval datum-to-eval))))
-
 
 (define (templated-source? path)
   (or (markup-source? path) (markdown-source? path)))
 
+(define (file-exists-or-has-source? path) ; path could be #f
+  (and path (for/first ([proc (in-list (list values ->preproc-source-path ->null-source-path))]
+                        #:when (file-exists? (proc path)))
+                       path)))
+
+(define (get-template-from-metas source-path output-path-ext)
+  (with-handlers ([exn:fail:contract? (λ (e) #f)]) ; in case source-path doesn't work with cached-require
+    (parameterize ([current-directory (current-project-root)])
+      (define source-metas (cached-metas source-path))
+      (define template-name-or-names ; #f or atom or list
+        (select-from-metas (setup:template-meta-key source-path) source-metas)) 
+      (define template-name (if (list? template-name-or-names)
+                                (findf (λ (tn) (eq? (get-ext tn) output-path-ext)) template-name-or-names)
+                                template-name-or-names))
+      (and template-name (build-path (dirname source-path) template-name)))))
+
+(define (get-default-template source-path output-path-ext)
+  (and output-path-ext
+       (let ([default-template-filename (add-ext (setup:template-prefix source-path) output-path-ext)])
+         (find-upward-from source-path default-template-filename file-exists-or-has-source?))))
+
+(define (get-fallback-template source-path output-path-ext)
+  (and output-path-ext
+       (build-path (current-server-extras-path)
+                   (add-ext (setup:fallback-template-prefix source-path) output-path-ext))))
 
 (define+provide/contract (get-template-for source-path [maybe-output-path #f])
   ((complete-path?)((or/c #f complete-path?)) . ->* . (or/c #f complete-path?))
-  
+  (and (templated-source? source-path)
-  (define (file-exists-or-has-source? p) ; p could be #f
+       (let ()
-    (and p (for/first ([proc (in-list (list values ->preproc-source-path ->null-source-path))]
+         (define output-path (or maybe-output-path (->output-path source-path)))
-                       #:when (file-exists? (proc p)))
+         ;; output-path may not have an extension
-             p)))
+         (define output-path-ext (or (get-ext output-path) (current-poly-target)))
-  
+         (for/or ([proc (list get-template-from-metas get-default-template get-fallback-template)])
-  (define (get-template)
+                 (file-exists-or-has-source? (proc source-path output-path-ext))))))
-    (define output-path (or maybe-output-path (->output-path source-path)))
-    (define output-path-ext (or (get-ext output-path) (current-poly-target))) ; output-path may not have an extension
-    
-    (define (get-template-from-metas)
-      (with-handlers ([exn:fail:contract? (λ (e) #f)]) ; in case source-path doesn't work with cached-require
-        (parameterize ([current-directory (current-project-root)])
-          (define source-metas (cached-metas source-path))
-          (define template-name-or-names ; #f or atom or list
-            (select-from-metas (setup:template-meta-key source-path) source-metas)) 
-          (define template-name (if (list? template-name-or-names)
-                                    (findf (λ (tn) (eq? (get-ext tn) output-path-ext)) template-name-or-names)
-                                    template-name-or-names))
-          (and template-name (build-path (dirname source-path) template-name)))))
-    
-    (define (get-default-template)
-      (and output-path-ext
-           (let ([default-template-filename (add-ext (setup:template-prefix source-path) output-path-ext)])
-             (find-upward-from source-path default-template-filename file-exists-or-has-source?))))
-
-    (define (get-fallback-template)
-      (and output-path-ext
-           (build-path (current-server-extras-path)
-                       (add-ext (setup:fallback-template-prefix source-path) output-path-ext))))
-    
-    (or (file-exists-or-has-source? (get-template-from-metas))
-        (file-exists-or-has-source? (get-default-template))
-        (file-exists-or-has-source? (get-fallback-template))))   
-  
-  (and (templated-source? source-path) (get-template)))
-
 
 (module-test-external
  (require pollen/setup sugar/file sugar/coerce)
@@ -312,10 +290,11 @@
    (check-false (get-template-for (->complete-path "foo.poly.pm")))
    (check-equal? (get-template-for (->complete-path "foo.html.pm")) fallback.html)))
 
-
 (define-namespace-anchor render-module-ns)
-(define (render-through-eval expr-to-eval)
+(define (render-datum-through-eval datum-to-eval)
+  ;; render a datum, not a syntax object, so that it can have fresh bindings.
   (parameterize ([current-namespace (make-base-namespace)]
                  [current-output-port (current-error-port)])
-    (namespace-attach-module (namespace-anchor->namespace render-module-ns) 'pollen/setup) ; brings in params
+    (namespace-attach-module (namespace-anchor->namespace render-module-ns)
-    (eval expr-to-eval)))
+                             'pollen/setup (current-namespace)) ; brings in params
+    (eval datum-to-eval)))