Rearrange protocols subtree

syndicate/.gitignore

@@ -0,0 +1 @@
+schemas/

syndicate/dataspace.rkt

@@ -2,9 +2,9 @@
 ;;; SPDX-License-Identifier: LGPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-(provide (all-from-out "schemas/gen/dataspace.rkt")
-         (all-from-out "schemas/gen/dataspacePatterns.rkt")
-         (all-from-out "schemas/gen/dataspacePatterns.meta.rkt")
+(provide (all-from-out "schemas/dataspace.rkt")
+         (all-from-out "schemas/dataspacePatterns.rkt")
+         (all-from-out "schemas/dataspacePatterns.meta.rkt")
 
          dataspace
          actor-system/dataspace)
@@ -23,9 +23,9 @@
 (require "syntax-classes.rkt")
 (require "skeleton.rkt")
 
-(require "schemas/gen/dataspace.rkt")
-(require "schemas/gen/dataspacePatterns.rkt")
-(require "schemas/gen/dataspacePatterns.meta.rkt")
+(require "schemas/dataspace.rkt")
+(require "schemas/dataspacePatterns.rkt")
+(require "schemas/dataspacePatterns.meta.rkt")
 
 (define-logger syndicate/dataspace)
 

syndicate/distributed/tcp-server.rkt

@@ -9,7 +9,7 @@
 (require syndicate/relay)
 (require syndicate/rewrite)
 (require syndicate/sturdy)
-(require syndicate/schemas/gen/gatekeeper)
+(require syndicate/schemas/gatekeeper)
 (require syndicate/sturdy)
 (require syndicate/drivers/tcp)
 

syndicate/drivers/racket-event.rkt

@@ -4,11 +4,11 @@
 
 ;; Generic Racket events.
 
-(provide (all-from-out syndicate/schemas/gen/racketEvent))
+(provide (all-from-out syndicate/schemas/racketEvent))
 
 (require syndicate/driver-support)
-(require syndicate/schemas/gen/racketEvent)
-(require syndicate/schemas/gen/dataspacePatterns)
+(require syndicate/schemas/racketEvent)
+(require syndicate/schemas/dataspacePatterns)
 
 (define-logger syndicate/drivers/racket-event)
 

syndicate/drivers/stream.rkt

@@ -2,7 +2,7 @@
 ;;; SPDX-License-Identifier: LGPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-(provide (all-from-out syndicate/schemas/gen/stream)
+(provide (all-from-out syndicate/schemas/stream)
 
          port-source
          port-sink
@@ -34,7 +34,7 @@
 (require syndicate/pattern)
 (require syndicate/driver-support)
 
-(require syndicate/schemas/gen/stream)
+(require syndicate/schemas/stream)
 
 (define-logger syndicate/drivers/stream)
 

syndicate/drivers/tcp.rkt

@@ -3,7 +3,7 @@
 ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 (provide (all-from-out syndicate/drivers/stream)
-         (all-from-out syndicate/schemas/gen/tcp))
+         (all-from-out syndicate/schemas/tcp))
 
 (require racket/async-channel)
 (require racket/tcp)
@@ -12,8 +12,8 @@
 (require syndicate/functional-queue)
 (require syndicate/pattern)
 (require syndicate/drivers/stream)
-(require syndicate/schemas/gen/tcp)
-(require syndicate/schemas/gen/dataspacePatterns)
+(require syndicate/schemas/tcp)
+(require syndicate/schemas/dataspacePatterns)
 
 (require (for-syntax racket/base))
 

syndicate/drivers/timer.rkt

@@ -2,13 +2,13 @@
 ;;; SPDX-License-Identifier: LGPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: Copyright © 2018-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-(provide (all-from-out syndicate/schemas/gen/timer)
+(provide (all-from-out syndicate/schemas/timer)
          timeout)
 
 (require syndicate/driver-support)
 (require syndicate/engine)
-(require syndicate/schemas/gen/timer)
-(require syndicate/schemas/gen/dataspacePatterns)
+(require syndicate/schemas/timer)
+(require syndicate/schemas/dataspacePatterns)
 (require data/heap)
 
 (define-logger syndicate/drivers/timer)

syndicate/pattern.rkt

@@ -22,7 +22,7 @@
 
          !dump-registered-preserves-patterns!
 
-         (all-from-out "schemas/gen/dataspacePatterns.rkt"))
+         (all-from-out "schemas/dataspacePatterns.rkt"))
 
 (require (for-syntax racket/base))
 (require (for-syntax racket/match))
@@ -38,7 +38,7 @@
 (require racket/list)
 (require "pattern-expander.rkt")
 (require "smart-pattern.rkt")
-(require "schemas/gen/dataspacePatterns.rkt")
+(require "schemas/dataspacePatterns.rkt")
 
 ;;---------------------------------------------------------------------------
 

syndicate/private/install.rkt

@@ -13,10 +13,10 @@
                   schema-compiler-plugin-mode))
 
 (define (pre-installer _collects-path syndicate-path)
-  (define output-directory (build-path syndicate-path "schemas/gen"))
+  (define output-directory (build-path syndicate-path "schemas"))
   (delete-directory/files output-directory #:must-exist? #f)
   (parameterize ((schema-compiler-plugin-mode 'meta))
-    (batch-compile #:inputs (list (build-path syndicate-path "schemas/**.prs"))
+    (batch-compile #:inputs (list (build-path syndicate-path "../protocols/schemas/**.prs"))
                    #:additional-modules (hash '(EntityRef) 'syndicate/entity-ref)
                    #:output-directory output-directory
                    #:plugins (list schema-compiler-plugin))))

syndicate/query.rkt

@@ -29,7 +29,7 @@
 (require "syntax.rkt")
 (require "bag.rkt")
 
-(require "schemas/gen/dataspace.rkt")
+(require "schemas/dataspace.rkt")
 
 (begin-for-syntax
   (define-splicing-syntax-class on-add

syndicate/relay.rkt

@@ -13,8 +13,8 @@
 (require (only-in "actor.rkt" current-turn))
 (require "engine.rkt")
 (require "rewrite.rkt")
-(require "schemas/gen/protocol.rkt")
-(require (prefix-in sturdy: "schemas/gen/sturdy.rkt"))
+(require "schemas/protocol.rkt")
+(require (prefix-in sturdy: "schemas/sturdy.rkt"))
 
 (define-logger syndicate/relay)
 

syndicate/rewrite.rkt

@@ -10,7 +10,7 @@
 (require preserves)
 
 (require "entity-ref.rkt")
-(require "schemas/gen/sturdy.rkt")
+(require "schemas/sturdy.rkt")
 
 (define (match-Pattern p v)
   (define bindings (make-hasheq))

syndicate/schema-compiler.rkt

@@ -27,7 +27,7 @@
                                          paths) options)
   (define ds-path
     (match (schema-compiler-plugin-mode)
-      ['normal 'syndicate/schemas/gen/dataspacePatterns]
+      ['normal 'syndicate/schemas/dataspacePatterns]
       ['meta (lookup-module-path '(dataspacePatterns))]))
   (define meta?
     (match (schema-compiler-plugin-mode)

syndicate/schemas/.gitignore

@@ -1 +0,0 @@
-gen/

syndicate/service.rkt

@@ -2,7 +2,7 @@
 ;;; SPDX-License-Identifier: LGPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-(provide (all-from-out syndicate/schemas/gen/service)
+(provide (all-from-out syndicate/schemas/service)
 
          with-services
          provide-service
@@ -16,7 +16,7 @@
 (require syndicate/syntax)
 (require syndicate/pattern)
 (require syndicate/dataspace)
-(require syndicate/schemas/gen/service)
+(require syndicate/schemas/service)
 
 (define-logger syndicate/service)
 

syndicate/smart-pattern.rkt

@@ -13,7 +13,7 @@
 
 (require racket/match)
 (require preserves)
-(require syndicate/schemas/gen/dataspacePatterns)
+(require syndicate/schemas/dataspacePatterns)
 
 (define (rec label arity pats)
   (Pattern-DCompound (DCompound-rec (CRec label arity) pats)))

syndicate/sturdy.rkt

@@ -18,14 +18,14 @@
          attenuate-sturdy
          SturdyRef-valid?
          validate
-         (all-from-out "schemas/gen/sturdy.rkt"))
+         (all-from-out "schemas/sturdy.rkt"))
 
 (require racket/match)
 (require (only-in sha hmac-sha256))
 (require (only-in racket/random crypto-random-bytes))
 (require preserves)
 (require preserves-schema)
-(require "schemas/gen/sturdy.rkt")
+(require "schemas/sturdy.rkt")
 
 (define KEY_LENGTH 16) ;; 128 bits
 

syndicate/syntax.rkt

@@ -327,7 +327,7 @@
 (define-syntax-rule (stop-on event expr ...)
   (on event (stop-current-facet expr ...)))
 
-(require "schemas/gen/dataspace.rkt")
+(require "schemas/dataspace.rkt")
 
 (define-syntax on
   (lambda (stx)