Merge pull request #1384 from AmpersandTarski/feature/angularGenerator

Feature/angular generator

ReleaseNotes.md

@@ -2,6 +2,9 @@
 
 ## Unreleased changes
 
+## v4.7.5 (25 february 2023)
+* [Issue #1381](https://github.com/AmpersandTarski/Ampersand/issues/1381) Generate prototype with Angular frontend.
+
 ## v4.7.4 (20 february 2023)
 
 - [Issue #1281 (extra fix after reopening of issue)](https://github.com/AmpersandTarski/Ampersand/issues/1281#issuecomment-1159623865) Final fix an omision in typecheck of ENFORCE statement.

ampersand.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           ampersand
-version:        4.7.4
+version:        4.7.5
 synopsis:       Toolsuite for automated design of enterprise information systems.
 description:    You can define your business processes by means of rules, written in Relation Algebra.
 category:       Database Design

package.yaml

@@ -1,5 +1,5 @@
 name: ampersand
-version: 4.7.4
+version: 4.7.5
 author: Stef Joosten
 maintainer: [email protected]
 synopsis: Toolsuite for automated design of enterprise information systems.

src/Ampersand/Core/AbstractSyntaxTree.hs

@@ -533,7 +533,7 @@ data ViewDef = Vd
     -- | the constituent attributes (i.e. name/term pairs) of this view.
     vdats :: [ViewSegment]
   }
-  deriving (Show)
+  deriving (Show, Data)
 
 instance Named ViewDef where
   name = vdlbl
@@ -556,7 +556,7 @@ data ViewSegment = ViewSegment
     vsmSeqNr :: Integer,
     vsmLoad :: ViewSegmentPayLoad
   }
-  deriving (Show)
+  deriving (Show, Data)
 
 instance Traced ViewSegment where
   origin = vsmpos
@@ -568,7 +568,7 @@ data ViewSegmentPayLoad
   | ViewText
       { vsgmTxt :: Text
       }
-  deriving (Eq, Show)
+  deriving (Eq, Show, Data)
 
 -- | data structure AClassify contains the CLASSIFY statements from an Ampersand script
 --   CLASSIFY Employee ISA Person   translates to Isa (C "Person") (C "Employee")
@@ -776,7 +776,7 @@ data Cruds = Cruds
     crudU :: Bool,
     crudD :: Bool
   }
-  deriving (Show)
+  deriving (Show, Data)
 
 data SubInterface
   = Box

src/Ampersand/Core/ParseTree.hs

@@ -1091,7 +1091,7 @@ data P_ViewSegmtPayLoad a
 
 newtype ViewHtmlTemplate = ViewHtmlTemplateFile FilePath
   --              | ViewHtmlTemplateInline Text -- Future extension
-  deriving (Eq, Ord, Show)
+  deriving (Eq, Ord, Show, Data)
 
 instance Functor P_ViewSegmtPayLoad where fmap = fmapDefault
 

src/Ampersand/Misc/HasClasses.hs

@@ -79,10 +79,12 @@ class HasProtoOpts a => HasDirPrototype a where
   getTemplateDir x =
     getDirPrototype x </> case view frontendVersionL x of
       AngularJS -> "templates"
-      Angular -> "angular-app/templates"
+      Angular -> ".templates"
   getAppDir :: a -> FilePath
   getAppDir x =
-    getDirPrototype x </> "public" </> "app" </> "project"
+    getDirPrototype x </> case view frontendVersionL x of
+      AngularJS -> "public" </> "app" </> "project"
+      Angular -> ""
   getGenericsDir :: a -> FilePath
   getGenericsDir x =
     getDirPrototype x </> "generics"