Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From trunk To v0.11.0
2024-12-13
| ||
14:14 | Remove query action constants for rss/atom feed ... (Leaf check-in: 7902e0d349 user: stern tags: trunk) | |
12:10 | Version 0.19.0 ... (check-in: fd15ae683e user: stern tags: release, trunk, v0.19.0) | |
2023-04-02
| ||
16:14 | Add metadata key 'expire' ... (check-in: e11f223228 user: stern tags: trunk) | |
2023-03-27
| ||
14:37 | Version 0.11.0 ... (check-in: 331cad470c user: stern tags: release, trunk, v0.11.0) | |
14:34 | Version 0.11.0 ... (check-in: 712c21afc8 user: stern tags: release, trunk, v0.10.0) | |
Added .github/dependabot.yml.
> > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | # To get started with Dependabot version updates, you'll need to specify which # package ecosystems to update and where the package manifests are located. # Please see the documentation for all configuration options: # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 updates: - package-ecosystem: "gomod" # See documentation for possible values directory: "/" # Location of package manifests schedule: interval: "daily" rebase-strategy: "disabled" |
Changes to api/api.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | | | | > | > > > > > > | > > > | > | | | | > > > > > > | > | | | | > > > > > > > | | < | < < < | > | > > | > > > > | | > > > > > > > | | > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- // Package api contains common definitions used for client and server. package api // ZettelID contains the identifier of a zettel. It is a string with 14 digits. type ZettelID string // InvalidZID is an invalif zettel identifier const InvalidZID = "" // IsValid returns true, if the idenfifier contains 14 digits. func (zid ZettelID) IsValid() bool { if len(zid) != 14 { return false } for i := 0; i < 14; i++ { ch := zid[i] if ch < '0' || '9' < ch { return false } } return true } // ZettelMeta is a map containg the metadata of a zettel. type ZettelMeta map[string]string // ZettelRights is an integer that encode access rights for a zettel. type ZettelRights uint8 // Values for ZettelRights, can be or-ed const ( ZettelCanNone ZettelRights = 1 << iota ZettelCanCreate // Current user is allowed to create a new zettel ZettelCanRead // Requesting user is allowed to read the zettel ZettelCanWrite // Requesting user is allowed to update the zettel ZettelCanRename // Requesting user is allowed to provide the zettel with a new identifier ZettelCanDelete // Requesting user is allowed to delete the zettel ) // AuthJSON contains the result of an authentication call. type AuthJSON struct { Token string `json:"token"` Type string `json:"token_type"` Expires int `json:"expires_in"` } // ZidJSON contains the identifier data of a zettel. type ZidJSON struct { ID ZettelID `json:"id"` } // MetaJSON contains the metadata of a zettel. type MetaJSON struct { Meta ZettelMeta `json:"meta"` Rights ZettelRights `json:"rights"` } // ZidMetaJSON contains the identifier and the metadata of a zettel. type ZidMetaJSON struct { ID ZettelID `json:"id"` Meta ZettelMeta `json:"meta"` Rights ZettelRights `json:"rights"` } // ZidMetaRelatedList contains identifier/metadata of a zettel and the same for related zettel type ZidMetaRelatedList struct { ID ZettelID `json:"id"` Meta ZettelMeta `json:"meta"` Rights ZettelRights `json:"rights"` List []ZidMetaJSON `json:"list"` } // ZettelDataJSON contains all data for a zettel. type ZettelDataJSON struct { Meta ZettelMeta `json:"meta"` Encoding string `json:"encoding"` Content string `json:"content"` } // ZettelJSON contains all data for a zettel, the identifier, the metadata, and the content. type ZettelJSON struct { ID ZettelID `json:"id"` Meta ZettelMeta `json:"meta"` Encoding string `json:"encoding"` Content string `json:"content"` Rights ZettelRights `json:"rights"` } // ZettelContentJSON contains all elements to transfer the content of a zettel. type ZettelContentJSON struct { Encoding string `json:"encoding"` Content string `json:"content"` } // ZettelListJSON contains data for a zettel list. type ZettelListJSON struct { Query string `json:"query"` Human string `json:"human"` List []ZidMetaJSON `json:"list"` } // MapMeta maps metadata keys to list of metadata. type MapMeta map[string][]ZettelID // MapListJSON specifies the map of metadata key to list of metadata that contains the key. type MapListJSON struct { Map MapMeta `json:"map"` } // VersionJSON contains version information. type VersionJSON struct { Major int `json:"major"` Minor int `json:"minor"` Patch int `json:"patch"` Info string `json:"info"` Hash string `json:"hash"` } |
Changes to api/const.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | < < < < < < < < < < < < < < | | | | | | | | < < | | | | > < < < < < < < < < < < < < < < | < < < < > | < < < < < < < < < < | | | < < | | | | | | | > | | < | | > > > > > < > | > > > > | | > | < | | | | > < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package api import "fmt" // Predefined Zettel Identifier const ( // System zettel ZidVersion = ZettelID("00000000000001") ZidHost = ZettelID("00000000000002") ZidOperatingSystem = ZettelID("00000000000003") ZidLicense = ZettelID("00000000000004") ZidAuthors = ZettelID("00000000000005") ZidDependencies = ZettelID("00000000000006") ZidLog = ZettelID("00000000000007") ZidBoxManager = ZettelID("00000000000020") ZidMetadataKey = ZettelID("00000000000090") ZidParser = ZettelID("00000000000092") ZidStartupConfiguration = ZettelID("00000000000096") ZidConfiguration = ZettelID("00000000000100") // WebUI HTML templates are in the range 10000..19999 ZidBaseTemplate = ZettelID("00000000010100") ZidLoginTemplate = ZettelID("00000000010200") ZidListTemplate = ZettelID("00000000010300") ZidZettelTemplate = ZettelID("00000000010401") ZidInfoTemplate = ZettelID("00000000010402") ZidFormTemplate = ZettelID("00000000010403") ZidRenameTemplate = ZettelID("00000000010404") ZidDeleteTemplate = ZettelID("00000000010405") ZidContextTemplate = ZettelID("00000000010406") ZidErrorTemplate = ZettelID("00000000010700") // CSS-related zettel are in the range 20000..29999 ZidBaseCSS = ZettelID("00000000020001") ZidUserCSS = ZettelID("00000000025001") ZidRoleCSSMap = ZettelID("00000000029000") // Maps roles to CSS zettel, which should be in the range 29001..29999. // WebUI JS zettel are in the range 30000..39999 // WebUI image zettel are in the range 40000..49999 ZidEmoji = ZettelID("00000000040001") // Range 90000...99999 is reserved for zettel templates ZidTOCNewTemplate = ZettelID("00000000090000") ZidTemplateNewZettel = ZettelID("00000000090001") ZidTemplateNewUser = ZettelID("00000000090002") ZidDefaultHome = ZettelID("00010000000000") ) // LengthZid factors the constant length of a zettel identifier const LengthZid = len(ZidDefaultHome) // Values of the metadata key/value type. const ( MetaCredential = "Credential" MetaEmpty = "EString" MetaID = "Identifier" MetaIDSet = "IdentifierSet" MetaNumber = "Number" MetaString = "String" MetaTagSet = "TagSet" MetaTimestamp = "Timestamp" MetaURL = "URL" MetaWord = "Word" MetaWordSet = "WordSet" MetaZettelmarkup = "Zettelmarkup" ) // Predefined general Metadata keys const ( KeyID = "id" KeyTitle = "title" KeyRole = "role" KeyTags = "tags" KeySyntax = "syntax" KeyAuthor = "author" KeyBack = "back" KeyBackward = "backward" KeyBoxNumber = "box-number" KeyCopyright = "copyright" KeyCreated = "created" KeyCredential = "credential" KeyDead = "dead" KeyFolge = "folge" KeyForward = "forward" KeyLang = "lang" KeyLicense = "license" KeyModified = "modified" KeyPrecursor = "precursor" KeyPredecessor = "predecessor" KeyPublished = "published" KeyQuery = "query" KeyReadOnly = "read-only" KeySuccessors = "successors" KeySummary = "summary" KeyURL = "url" KeyUselessFiles = "useless-files" KeyUserID = "user-id" KeyUserRole = "user-role" KeyVisibility = "visibility" ) // Predefined Metadata values const ( ValueFalse = "false" ValueTrue = "true" ValueLangEN = "en" ValueRoleConfiguration = "configuration" ValueRoleZettel = "zettel" ValueSyntaxCSS = "css" ValueSyntaxDraw = "draw" ValueSyntaxGif = "gif" ValueSyntaxHTML = "html" ValueSyntaxMarkdown = "markdown" ValueSyntaxMD = "md" ValueSyntaxMustache = "mustache" ValueSyntaxNone = "none" ValueSyntaxSVG = "svg" ValueSyntaxText = "text" ValueSyntaxZmk = "zmk" ValueUserRoleCreator = "creator" ValueUserRoleOwner = "owner" ValueUserRoleReader = "reader" ValueUserRoleWriter = "writer" ValueVisibilityCreator = "creator" ValueVisibilityExpert = "expert" ValueVisibilityLogin = "login" ValueVisibilityOwner = "owner" ValueVisibilityPublic = "public" ) // Additional HTTP constants. const ( MethodMove = "MOVE" // HTTP method for renaming a zettel HeaderAccept = "Accept" HeaderContentType = "Content-Type" HeaderDestination = "Destination" HeaderLocation = "Location" ) // Values for HTTP query parameter. const ( QueryKeyCommand = "cmd" QueryKeyCost = "cost" QueryKeyDir = "dir" QueryKeyEncoding = "enc" QueryKeyParseOnly = "parseonly" QueryKeyLimit = "limit" QueryKeyPart = "part" QueryKeyPhrase = "phrase" QueryKeyQuery = "q" QueryKeySeed = "_seed" ) // Supported dir values. const ( DirBackward = "backward" DirForward = "forward" ) // Supported encoding values. const ( EncodingHTML = "html" EncodingMD = "md" EncodingSexpr = "sexpr" EncodingSHTML = "shtml" EncodingText = "text" EncodingZMK = "zmk" EncodingPlain = "plain" EncodingJson = "json" ) var mapEncodingEnum = map[string]EncodingEnum{ EncodingHTML: EncoderHTML, EncodingMD: EncoderMD, EncodingSexpr: EncoderSexpr, EncodingSHTML: EncoderSHTML, EncodingText: EncoderText, EncodingZMK: EncoderZmk, EncodingPlain: EncoderPlain, EncodingJson: EncoderJson, } var mapEnumEncoding = map[EncodingEnum]string{} func init() { for k, v := range mapEncodingEnum { mapEnumEncoding[v] = k } |
︙ | ︙ | |||
253 254 255 256 257 258 259 | type EncodingEnum uint8 // Values for EncoderEnum const ( EncoderUnknown EncodingEnum = iota EncoderHTML EncoderMD | | | | | | < < < < < < < < < < < < < < < < < < | < < < < < < < < | | < | < < | | | | | | | | < < < < < < < | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | type EncodingEnum uint8 // Values for EncoderEnum const ( EncoderUnknown EncodingEnum = iota EncoderHTML EncoderMD EncoderSexpr EncoderSHTML EncoderText EncoderZmk EncoderPlain EncoderJson ) // String representation of an encoder key. func (e EncodingEnum) String() string { if f, ok := mapEnumEncoding[e]; ok { return f } return fmt.Sprintf("*Unknown*(%d)", e) } // Supported part values. const ( PartMeta = "meta" PartContent = "content" PartZettel = "zettel" ) // Command to be executed atthe Zettelstore type Command string // Supported command values const ( CommandAuthenticated = Command("authenticated") CommandRefresh = Command("refresh") ) // Supported search operator representations const ( ActionSeparator = "|" ExistOperator = "?" ExistNotOperator = "!?" SearchOperatorNot = "!" SearchOperatorHas = ":" SearchOperatorHasNot = "!:" SearchOperatorPrefix = ">" SearchOperatorNoPrefix = "!>" SearchOperatorSuffix = "<" SearchOperatorNoSuffix = "!<" SearchOperatorMatch = "~" SearchOperatorNoMatch = "!~" ) |
Changes to api/urlbuilder.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | > > > > > < | > > > > > < | | > | > > | > | > > > > > > | < > | > > > > | | | | > > > > | | | > > > > > > | > | | < < | | < > | > | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package api import ( "net/url" "strings" ) type urlQuery struct{ key, val string } // URLBuilder should be used to create zettelstore URLs. type URLBuilder struct { prefix string key byte rawLocal string path []string query []urlQuery fragment string } // NewURLBuilder creates a new URL builder with the given prefix and key. func NewURLBuilder(prefix string, key byte) *URLBuilder { return &URLBuilder{prefix: prefix, key: key} } // Clone an URLBuilder func (ub *URLBuilder) Clone() *URLBuilder { cpy := new(URLBuilder) cpy.key = ub.key if len(ub.path) > 0 { cpy.path = make([]string, 0, len(ub.path)) cpy.path = append(cpy.path, ub.path...) } if len(ub.query) > 0 { cpy.query = make([]urlQuery, 0, len(ub.query)) cpy.query = append(cpy.query, ub.query...) } cpy.fragment = ub.fragment return cpy } // SetRawLocal sets everything that follows the prefix / key. func (ub *URLBuilder) SetRawLocal(rawLocal string) *URLBuilder { for len(rawLocal) > 0 && rawLocal[0] == '/' { rawLocal = rawLocal[1:] } ub.rawLocal = rawLocal ub.path = nil ub.query = nil ub.fragment = "" return ub } // SetZid sets the zettel identifier. func (ub *URLBuilder) SetZid(zid ZettelID) *URLBuilder { if len(ub.path) > 0 { panic("Cannot add Zid") } ub.rawLocal = "" ub.path = append(ub.path, string(zid)) return ub } // AppendPath adds a new path element func (ub *URLBuilder) AppendPath(p string) *URLBuilder { ub.rawLocal = "" for len(p) > 0 && p[0] == '/' { p = p[1:] } if p != "" { ub.path = append(ub.path, p) } return ub } // AppendKVQuery adds a new key/value query parameter func (ub *URLBuilder) AppendKVQuery(key, value string) *URLBuilder { ub.rawLocal = "" ub.query = append(ub.query, urlQuery{key, value}) return ub } // AppendQuery adds a new query func (ub *URLBuilder) AppendQuery(value string) *URLBuilder { ub.rawLocal = "" ub.query = append(ub.query, urlQuery{QueryKeyQuery, value}) return ub } // ClearQuery removes all query parameters. func (ub *URLBuilder) ClearQuery() *URLBuilder { ub.rawLocal = "" ub.query = nil ub.fragment = "" return ub } // SetFragment stores the fragment func (ub *URLBuilder) SetFragment(s string) *URLBuilder { ub.rawLocal = "" ub.fragment = s return ub } // String produces a string value. func (ub *URLBuilder) String() string { return ub.asString("&") } // AttrString returns the string value of the URL suitable to be placed in a HTML attribute. func (ub *URLBuilder) AttrString() string { return ub.asString("&") } func (ub *URLBuilder) asString(qsep string) string { var sb strings.Builder sb.WriteString(ub.prefix) if ub.key != '/' { sb.WriteByte(ub.key) } if ub.rawLocal != "" { sb.WriteString(ub.rawLocal) return sb.String() } for i, p := range ub.path { if i > 0 || ub.key != '/' { sb.WriteByte('/') } sb.WriteString(url.PathEscape(p)) } if len(ub.fragment) > 0 { sb.WriteByte('#') sb.WriteString(ub.fragment) } for i, q := range ub.query { if i == 0 { sb.WriteByte('?') } else { sb.WriteString(qsep) } sb.WriteString(q.key) if val := q.val; val != "" { sb.WriteByte('=') sb.WriteString(url.QueryEscape(val)) } } return sb.String() } |
Changes to attrs/attrs.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- // Package attrs stores attributes of zettel parts. package attrs import ( "strings" "zettelstore.de/c/maps" ) // Attributes store additional information about some node types. type Attributes map[string]string // IsEmpty returns true if there are no attributes. func (a Attributes) IsEmpty() bool { return len(a) == 0 } |
︙ | ︙ | |||
84 85 86 87 88 89 90 | func (a Attributes) Remove(key string) Attributes { if a != nil { delete(a, key) } return a } | | | | | | | | | > > > | | | < | | > > > | | | > | | | < > | | | < | < < | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | func (a Attributes) Remove(key string) Attributes { if a != nil { delete(a, key) } return a } // AddClass adds a value to the class attribute. func (a Attributes) AddClass(class string) Attributes { if a == nil { return map[string]string{"class": class} } classes := a.GetClasses() for _, cls := range classes { if cls == class { return a } } classes = append(classes, class) a["class"] = strings.Join(classes, " ") return a } // GetClasses returns the class values as a string slice func (a Attributes) GetClasses() []string { if a == nil { return nil } classes, ok := a["class"] if !ok { return nil } return strings.Fields(classes) } // HasClass returns true, if attributes contains the given class. func (a Attributes) HasClass(s string) bool { if a == nil { return false } classes, found := a["class"] if !found { return false } return strings.Contains(" "+classes+" ", " "+s+" ") } |
Changes to attrs/attrs_test.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | //----------------------------------------------------------------------------- // Copyright (c) 2020-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package attrs_test import ( "testing" "zettelstore.de/c/attrs" ) func TestHasDefault(t *testing.T) { t.Parallel() attr := attrs.Attributes{} if attr.HasDefault() { t.Error("Should not have default attr") |
︙ | ︙ | |||
53 54 55 56 57 58 59 | func TestHasClass(t *testing.T) { t.Parallel() testcases := []struct { classes string class string exp bool }{ | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | func TestHasClass(t *testing.T) { t.Parallel() testcases := []struct { classes string class string exp bool }{ {"", "", true}, {"x", "", false}, {"x", "x", true}, {"x", "y", false}, {"abc def ghi", "abc", true}, {"abc def ghi", "def", true}, {"abc def ghi", "ghi", true}, {"ab de gi", "b", false}, |
︙ | ︙ |
Changes to client/client.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < > | | | | < | > > > < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | //----------------------------------------------------------------------------- // Copyright (c) 2021-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- // Package client provides a client for accessing the Zettelstore via its API. package client import ( "bufio" "bytes" "context" "encoding/json" "io" "net" "net/http" "net/url" "strconv" "strings" "time" "codeberg.org/t73fde/sxpf" "codeberg.org/t73fde/sxpf/reader" "zettelstore.de/c/api" ) // Client contains all data to execute requests. type Client struct { base string username string password string token string tokenType string expires time.Time client http.Client } // Base returns the base part of the URLs that are used to communicate with a Zettelstore. func (c *Client) Base() string { return c.base } // NewClient create a new client. func NewClient(u *url.URL) *Client { myURL := *u myURL.User = nil myURL.ForceQuery = false myURL.RawQuery = "" myURL.Fragment = "" myURL.RawFragment = "" base := myURL.String() if !strings.HasSuffix(base, "/") { base += "/" } c := Client{ base: base, client: http.Client{ Timeout: 10 * time.Second, Transport: &http.Transport{ DialContext: (&net.Dialer{ Timeout: 5 * time.Second, // TCP connect timeout }).DialContext, TLSHandshakeTimeout: 5 * time.Second, }, }, } return &c } // Error encapsulates the possible client call errors. type Error struct { StatusCode int Message string Body []byte } func (err *Error) Error() string { var body string if err.Body == nil { body = "nil" } else if bl := len(err.Body); bl == 0 { body = "empty" } else { |
︙ | ︙ | |||
125 126 127 128 129 130 131 | return &Error{ StatusCode: resp.StatusCode, Message: resp.Status[4:], Body: body, } } | < < < < < < | | | < < < < > > > < < | | | < < < < < < < | | | < < | < < | < < < < | | | < < | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | > | > > > > > > > > > > | | > > > | > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > | | > | > | > > > > > > > | > > > > > > | > > > > > > | < > > > > > > | > > > > > > | > > > > > > | > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < | | > > > > > > > > > > > > > > > > > > | | | < | > < | | | < < < < | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 | return &Error{ StatusCode: resp.StatusCode, Message: resp.Status[4:], Body: body, } } func (c *Client) newURLBuilder(key byte) *api.URLBuilder { return api.NewURLBuilder(c.base, key) } func (*Client) newRequest(ctx context.Context, method string, ub *api.URLBuilder, body io.Reader) (*http.Request, error) { return http.NewRequestWithContext(ctx, method, ub.String(), body) } func (c *Client) executeRequest(req *http.Request) (*http.Response, error) { if c.token != "" { req.Header.Add("Authorization", c.tokenType+" "+c.token) } resp, err := c.client.Do(req) if err != nil { if resp != nil && resp.Body != nil { resp.Body.Close() } return nil, err } return resp, err } func (c *Client) buildAndExecuteRequest( ctx context.Context, method string, ub *api.URLBuilder, body io.Reader, h http.Header) (*http.Response, error) { req, err := c.newRequest(ctx, method, ub, body) if err != nil { return nil, err } err = c.updateToken(ctx) if err != nil { return nil, err } for key, val := range h { req.Header[key] = append(req.Header[key], val...) } return c.executeRequest(req) } // SetAuth sets authentication data. func (c *Client) SetAuth(username, password string) { c.username = username c.password = password c.token = "" c.tokenType = "" c.expires = time.Time{} } func (c *Client) executeAuthRequest(req *http.Request) error { resp, err := c.executeRequest(req) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return statusToError(resp) } dec := json.NewDecoder(resp.Body) var tinfo api.AuthJSON err = dec.Decode(&tinfo) if err != nil { return err } c.token = tinfo.Token c.tokenType = tinfo.Type c.expires = time.Now().Add(time.Duration(tinfo.Expires*10/9) * time.Second) return nil } func (c *Client) updateToken(ctx context.Context) error { if c.username == "" { return nil } if time.Now().After(c.expires) { return c.Authenticate(ctx) } return c.RefreshToken(ctx) } // Authenticate sets a new token by sending user name and password. func (c *Client) Authenticate(ctx context.Context) error { authData := url.Values{"username": {c.username}, "password": {c.password}} req, err := c.newRequest(ctx, http.MethodPost, c.newURLBuilder('a'), strings.NewReader(authData.Encode())) if err != nil { return err } req.Header.Set("Content-Type", "application/x-www-form-urlencoded") return c.executeAuthRequest(req) } // RefreshToken updates the access token func (c *Client) RefreshToken(ctx context.Context) error { req, err := c.newRequest(ctx, http.MethodPut, c.newURLBuilder('a'), nil) if err != nil { return err } return c.executeAuthRequest(req) } // CreateZettel creates a new zettel and returns its URL. func (c *Client) CreateZettel(ctx context.Context, data []byte) (api.ZettelID, error) { ub := c.newURLBuilder('z') resp, err := c.buildAndExecuteRequest(ctx, http.MethodPost, ub, bytes.NewBuffer(data), nil) if err != nil { return api.InvalidZID, err } defer resp.Body.Close() if resp.StatusCode != http.StatusCreated { return api.InvalidZID, statusToError(resp) } b, err := io.ReadAll(resp.Body) if err != nil { return api.InvalidZID, err } if zid := api.ZettelID(b); zid.IsValid() { return zid, nil } return api.InvalidZID, err } // CreateZettelJSON creates a new zettel and returns its URL. func (c *Client) CreateZettelJSON(ctx context.Context, data *api.ZettelDataJSON) (api.ZettelID, error) { var buf bytes.Buffer if err := encodeZettelData(&buf, data); err != nil { return api.InvalidZID, err } ub := c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPost, ub, &buf, nil) if err != nil { return api.InvalidZID, err } defer resp.Body.Close() if resp.StatusCode != http.StatusCreated { return api.InvalidZID, statusToError(resp) } dec := json.NewDecoder(resp.Body) var newZid api.ZidJSON err = dec.Decode(&newZid) if err != nil { return api.InvalidZID, err } if zid := newZid.ID; zid.IsValid() { return zid, nil } return api.InvalidZID, err } func encodeZettelData(buf *bytes.Buffer, data *api.ZettelDataJSON) error { enc := json.NewEncoder(buf) enc.SetEscapeHTML(false) return enc.Encode(&data) } var bsLF = []byte{'\n'} // ListZettel returns a list of all Zettel. func (c *Client) ListZettel(ctx context.Context, query string) ([][]byte, error) { ub := c.newURLBuilder('z').AppendQuery(query) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() switch resp.StatusCode { case http.StatusOK: case http.StatusNoContent: default: return nil, statusToError(resp) } data, err := io.ReadAll(resp.Body) if err != nil { return nil, err } lines := bytes.Split(data, bsLF) if len(lines[len(lines)-1]) == 0 { lines = lines[:len(lines)-1] } return lines, nil } // ListZettelJSON returns a list of zettel. func (c *Client) ListZettelJSON(ctx context.Context, query string) (string, string, []api.ZidMetaJSON, error) { ub := c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson).AppendQuery(query) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return "", "", nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return "", "", nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var zl api.ZettelListJSON err = dec.Decode(&zl) if err != nil { return "", "", nil, err } return zl.Query, zl.Human, zl.List, nil } // GetZettel returns a zettel as a string. func (c *Client) GetZettel(ctx context.Context, zid api.ZettelID, part string) ([]byte, error) { ub := c.newURLBuilder('z').SetZid(zid) if part != "" && part != api.PartContent { ub.AppendKVQuery(api.QueryKeyPart, part) } resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() switch resp.StatusCode { case http.StatusOK: case http.StatusNoContent: default: return nil, statusToError(resp) } return io.ReadAll(resp.Body) } // GetZettelJSON returns a zettel as a JSON struct. func (c *Client) GetZettelJSON(ctx context.Context, zid api.ZettelID) (*api.ZettelDataJSON, error) { ub := c.newURLBuilder('z').SetZid(zid) ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) ub.AppendKVQuery(api.QueryKeyPart, api.PartZettel) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var out api.ZettelDataJSON err = dec.Decode(&out) if err != nil { return nil, err } return &out, nil } // GetParsedZettel return a parsed zettel in a defined encoding. func (c *Client) GetParsedZettel(ctx context.Context, zid api.ZettelID, enc api.EncodingEnum) ([]byte, error) { return c.getZettelString(ctx, zid, enc, true) } // GetEvaluatedZettel return an evaluated zettel in a defined encoding. func (c *Client) GetEvaluatedZettel(ctx context.Context, zid api.ZettelID, enc api.EncodingEnum) ([]byte, error) { return c.getZettelString(ctx, zid, enc, false) } func (c *Client) getZettelString(ctx context.Context, zid api.ZettelID, enc api.EncodingEnum, parseOnly bool) ([]byte, error) { ub := c.newURLBuilder('z').SetZid(zid) ub.AppendKVQuery(api.QueryKeyEncoding, enc.String()) ub.AppendKVQuery(api.QueryKeyPart, api.PartContent) if parseOnly { ub.AppendKVQuery(api.QueryKeyParseOnly, "") } resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() switch resp.StatusCode { case http.StatusOK: case http.StatusNoContent: default: return nil, statusToError(resp) } return io.ReadAll(resp.Body) } // GetParsedSexpr returns an parsed zettel as a Sexpr-decoded data structure. func (c *Client) GetParsedSexpr(ctx context.Context, zid api.ZettelID, part string, sf sxpf.SymbolFactory) (sxpf.Object, error) { return c.getSexpr(ctx, zid, part, true, sf) } // GetEvaluatedSexpr returns an evaluated zettel as a Sexpr-decoded data structure. func (c *Client) GetEvaluatedSexpr(ctx context.Context, zid api.ZettelID, part string, sf sxpf.SymbolFactory) (sxpf.Object, error) { return c.getSexpr(ctx, zid, part, false, sf) } func (c *Client) getSexpr(ctx context.Context, zid api.ZettelID, part string, parseOnly bool, sf sxpf.SymbolFactory) (sxpf.Object, error) { ub := c.newURLBuilder('z').SetZid(zid) ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingSexpr) if part != "" { ub.AppendKVQuery(api.QueryKeyPart, part) } if parseOnly { ub.AppendKVQuery(api.QueryKeyParseOnly, "") } resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } return reader.MakeReader(bufio.NewReaderSize(resp.Body, 8), reader.WithSymbolFactory(sf)).Read() } // GetMeta returns the metadata of a zettel. func (c *Client) GetMeta(ctx context.Context, zid api.ZettelID) (api.ZettelMeta, error) { ub := c.newURLBuilder('z').SetZid(zid) ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) ub.AppendKVQuery(api.QueryKeyPart, api.PartMeta) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var out api.MetaJSON err = dec.Decode(&out) if err != nil { return nil, err } return out.Meta, nil } // GetZettelOrder returns metadata of the given zettel and, more important, // metadata of zettel that are referenced in a list within the first zettel. func (c *Client) GetZettelOrder(ctx context.Context, zid api.ZettelID) (*api.ZidMetaRelatedList, error) { ub := c.newURLBuilder('o').SetZid(zid) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var out api.ZidMetaRelatedList err = dec.Decode(&out) if err != nil { return nil, err } return &out, nil } // ContextDirection specifies how the context should be calculated. type ContextDirection uint8 // Allowed values for ContextDirection const ( _ ContextDirection = iota DirBoth DirBackward DirForward ) // GetZettelContext returns metadata of the given zettel and, more important, // metadata of zettel that for the context of the first zettel. func (c *Client) GetZettelContext( ctx context.Context, zid api.ZettelID, dir ContextDirection, cost, limit int) ( *api.ZidMetaRelatedList, error, ) { ub := c.newURLBuilder('x').SetZid(zid) switch dir { case DirBackward: ub.AppendKVQuery(api.QueryKeyDir, api.DirBackward) case DirForward: ub.AppendKVQuery(api.QueryKeyDir, api.DirForward) } if cost > 0 { ub.AppendKVQuery(api.QueryKeyCost, strconv.Itoa(cost)) } if limit > 0 { ub.AppendKVQuery(api.QueryKeyLimit, strconv.Itoa(limit)) } resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var out api.ZidMetaRelatedList err = dec.Decode(&out) if err != nil { return nil, err } return &out, nil } // GetUnlinkedReferences returns connections to other zettel, embedded material, externals URLs. func (c *Client) GetUnlinkedReferences( ctx context.Context, zid api.ZettelID, query url.Values) (*api.ZidMetaRelatedList, error) { ub := c.newQueryURLBuilder('u', query).SetZid(zid) resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var out api.ZidMetaRelatedList err = dec.Decode(&out) if err != nil { return nil, err } return &out, nil } // UpdateZettel updates an existing zettel. func (c *Client) UpdateZettel(ctx context.Context, zid api.ZettelID, data []byte) error { ub := c.newURLBuilder('z').SetZid(zid) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPut, ub, bytes.NewBuffer(data), nil) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return statusToError(resp) } return nil } // UpdateZettelJSON updates an existing zettel. func (c *Client) UpdateZettelJSON(ctx context.Context, zid api.ZettelID, data *api.ZettelDataJSON) error { var buf bytes.Buffer if err := encodeZettelData(&buf, data); err != nil { return err } ub := c.newURLBuilder('z').SetZid(zid).AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPut, ub, &buf, nil) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return statusToError(resp) } return nil } // RenameZettel renames a zettel. func (c *Client) RenameZettel(ctx context.Context, oldZid, newZid api.ZettelID) error { ub := c.newURLBuilder('z').SetZid(oldZid) h := http.Header{ api.HeaderDestination: {c.newURLBuilder('z').SetZid(newZid).String()}, } resp, err := c.buildAndExecuteRequest(ctx, api.MethodMove, ub, nil, h) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return statusToError(resp) } return nil } // DeleteZettel deletes a zettel with the given identifier. func (c *Client) DeleteZettel(ctx context.Context, zid api.ZettelID) error { ub := c.newURLBuilder('z').SetZid(zid) resp, err := c.buildAndExecuteRequest(ctx, http.MethodDelete, ub, nil, nil) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return statusToError(resp) } return nil } // ExecuteCommand will execute a given command at the Zettelstore. func (c *Client) ExecuteCommand(ctx context.Context, command api.Command) error { ub := c.newURLBuilder('x').AppendKVQuery(api.QueryKeyCommand, string(command)) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPost, ub, nil, nil) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return statusToError(resp) } return nil } func (c *Client) newQueryURLBuilder(key byte, query url.Values) *api.URLBuilder { ub := c.newURLBuilder(key) for key, values := range query { if key == api.QueryKeyEncoding { continue } for _, val := range values { ub.AppendKVQuery(key, val) } } return ub } // QueryMapMeta returns a map of all metadata values with the given query action to the // list of zettel IDs containing this value. func (c *Client) QueryMapMeta(ctx context.Context, query string) (api.MapMeta, error) { err := c.updateToken(ctx) if err != nil { return nil, err } req, err := c.newRequest(ctx, http.MethodGet, c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson).AppendQuery(query), nil) if err != nil { return nil, err } resp, err := c.executeRequest(req) if err != nil { return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, statusToError(resp) } dec := json.NewDecoder(resp.Body) var mlj api.MapListJSON err = dec.Decode(&mlj) if err != nil { return nil, err } return mlj.Map, nil } // GetVersionJSON returns version information.. func (c *Client) GetVersionJSON(ctx context.Context) (api.VersionJSON, error) { resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, c.newURLBuilder('x'), nil, nil) if err != nil { return api.VersionJSON{}, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return api.VersionJSON{}, statusToError(resp) } dec := json.NewDecoder(resp.Body) var version api.VersionJSON err = dec.Decode(&version) if err != nil { return api.VersionJSON{}, err } return version, nil } |
Changes to client/client_test.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < > | | > | | > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package client_test import ( "context" "flag" "net/http" "net/url" "testing" "codeberg.org/t73fde/sxpf" "zettelstore.de/c/api" "zettelstore.de/c/client" "zettelstore.de/c/sexpr" ) func TestZettelList(t *testing.T) { c := getClient() _, err := c.ListZettel(context.Background(), "") if err != nil { t.Error(err) return } } func TestGetProtectedZettel(t *testing.T) { c := getClient() _, err := c.GetZettel(context.Background(), api.ZidStartupConfiguration, api.PartZettel) if err != nil { if cErr, ok := err.(*client.Error); ok && cErr.StatusCode == http.StatusForbidden { return } else { t.Error(err) } return } } func TestGetSexprZettel(t *testing.T) { c := getClient() sf := sxpf.MakeMappedFactory() var zetSyms sexpr.ZettelSymbols zetSyms.InitializeZettelSymbols(sf) value, err := c.GetEvaluatedSexpr(context.Background(), api.ZidDefaultHome, api.PartContent, sf) if err != nil { t.Error(err) return } if value.IsNil() { t.Error("No data") } |
︙ | ︙ |
Deleted client/retrieve.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to go.mod.
|
| | | | < | | 1 2 3 4 5 6 7 8 | module zettelstore.de/c go 1.20 require ( codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197 codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475 ) |
Changes to go.sum.
|
| | | | | < < | 1 2 3 4 | codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197 h1:6kX7TY25agLFlHNvByO1Jc3GrBA7mu7aOa8tCOniUew= codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197/go.mod h1:Dp3EwBSsE3TvdPw9QZ4Wm25ZragluVT2OayRFRiq6jk= codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475 h1:0OTzV3FYY/Y7YsaVaSzF4Wd17pXzdH6DaSvMeqteJc4= codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475/go.mod h1:iSbMygOmtRQYp8pryNKYzRuMibYDSR80smU2b6qm1bc= |
Deleted input/entity.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted input/entity_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted input/input.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted input/input_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted input/runes.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to maps/maps.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package maps import "sort" func Keys[T any](m map[string]T) []string { if len(m) == 0 { return nil } result := make([]string, 0, len(m)) for k := range m { result = append(result, k) |
︙ | ︙ |
Changes to maps/maps_test.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package maps_test import ( "testing" "zettelstore.de/c/maps" ) func isSorted(seq []string) bool { for i := 1; i < len(seq); i++ { if seq[i] < seq[i-1] { return false } |
︙ | ︙ |
Deleted sexp/sexp.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sexp/sexp_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added sexpr/const.go.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package sexpr import "codeberg.org/t73fde/sxpf" // Various constants for Zettel data. Some of them are technically variables. const ( // Symbols for Metanodes NameSymBlock = "BLOCK" NameSymInline = "INLINE" NameSymList = "LIST" NameSymMeta = "META" NameSymQuote = "quote" // Symbols for Zettel node types. NameSymBLOB = "BLOB" NameSymCell = "CELL" NameSymCellCenter = "CELL-CENTER" NameSymCellLeft = "CELL-LEFT" NameSymCellRight = "CELL-RIGHT" NameSymCite = "CITE" NameSymDescription = "DESCRIPTION" NameSymEmbed = "EMBED" NameSymEmbedBLOB = "EMBED-BLOB" NameSymEndnote = "ENDNOTE" NameSymFormatEmph = "FORMAT-EMPH" NameSymFormatDelete = "FORMAT-DELETE" NameSymFormatInsert = "FORMAT-INSERT" NameSymFormatQuote = "FORMAT-QUOTE" NameSymFormatSpan = "FORMAT-SPAN" NameSymFormatSub = "FORMAT-SUB" NameSymFormatSuper = "FORMAT-SUPER" NameSymFormatStrong = "FORMAT-STRONG" NameSymHard = "HARD" NameSymHeading = "HEADING" NameSymLinkInvalid = "LINK-INVALID" NameSymLinkZettel = "LINK-ZETTEL" NameSymLinkSelf = "LINK-SELF" NameSymLinkFound = "LINK-FOUND" NameSymLinkBroken = "LINK-BROKEN" NameSymLinkHosted = "LINK-HOSTED" NameSymLinkBased = "LINK-BASED" NameSymLinkQuery = "LINK-QUERY" NameSymLinkExternal = "LINK-EXTERNAL" NameSymListOrdered = "ORDERED" NameSymListUnordered = "UNORDERED" NameSymListQuote = "QUOTATION" NameSymLiteralProg = "LITERAL-CODE" NameSymLiteralComment = "LITERAL-COMMENT" NameSymLiteralHTML = "LITERAL-HTML" NameSymLiteralInput = "LITERAL-INPUT" NameSymLiteralMath = "LITERAL-MATH" NameSymLiteralOutput = "LITERAL-OUTPUT" NameSymLiteralZettel = "LITERAL-ZETTEL" NameSymMark = "MARK" NameSymPara = "PARA" NameSymRegionBlock = "REGION-BLOCK" NameSymRegionQuote = "REGION-QUOTE" NameSymRegionVerse = "REGION-VERSE" NameSymSoft = "SOFT" NameSymSpace = "SPACE" NameSymTable = "TABLE" NameSymText = "TEXT" NameSymThematic = "THEMATIC" NameSymTransclude = "TRANSCLUDE" NameSymUnknown = "UNKNOWN-NODE" NameSymVerbatimComment = "VERBATIM-COMMENT" NameSymVerbatimEval = "VERBATIM-EVAL" NameSymVerbatimHTML = "VERBATIM-HTML" NameSymVerbatimMath = "VERBATIM-MATH" NameSymVerbatimProg = "VERBATIM-CODE" NameSymVerbatimZettel = "VERBATIM-ZETTEL" // Constant symbols for reference states. NameSymRefStateInvalid = "INVALID" NameSymRefStateZettel = "ZETTEL" NameSymRefStateSelf = "SELF" NameSymRefStateFound = "FOUND" NameSymRefStateBroken = "BROKEN" NameSymRefStateHosted = "HOSTED" NameSymRefStateBased = "BASED" NameSymRefStateQuery = "QUERY" NameSymRefStateExternal = "EXTERNAL" // Symbols for metadata types. NameSymTypeCredential = "CREDENTIAL" NameSymTypeEmpty = "EMPTY-STRING" NameSymTypeID = "ZID" NameSymTypeIDSet = "ZID-SET" NameSymTypeNumber = "NUMBER" NameSymTypeString = "STRING" NameSymTypeTagSet = "TAG-SET" NameSymTypeTimestamp = "TIMESTAMP" NameSymTypeURL = "URL" NameSymTypeWord = "WORD" NameSymTypeWordSet = "WORD-SET" NameSymTypeZettelmarkup = "ZETTELMARKUP" ) // ZettelSymbols collect all symbols needed to represent zettel data. type ZettelSymbols struct { // Symbols for Metanodes SymBlock *sxpf.Symbol SymInline *sxpf.Symbol SymList *sxpf.Symbol SymMeta *sxpf.Symbol SymQuote *sxpf.Symbol // Symbols for Zettel node types. SymBLOB *sxpf.Symbol SymCell *sxpf.Symbol SymCellCenter *sxpf.Symbol SymCellLeft *sxpf.Symbol SymCellRight *sxpf.Symbol SymCite *sxpf.Symbol SymDescription *sxpf.Symbol SymEmbed *sxpf.Symbol SymEmbedBLOB *sxpf.Symbol SymEndnote *sxpf.Symbol SymFormatEmph *sxpf.Symbol SymFormatDelete *sxpf.Symbol SymFormatInsert *sxpf.Symbol SymFormatQuote *sxpf.Symbol SymFormatSpan *sxpf.Symbol SymFormatSub *sxpf.Symbol SymFormatSuper *sxpf.Symbol SymFormatStrong *sxpf.Symbol SymHard *sxpf.Symbol SymHeading *sxpf.Symbol SymLinkInvalid *sxpf.Symbol SymLinkZettel *sxpf.Symbol SymLinkSelf *sxpf.Symbol SymLinkFound *sxpf.Symbol SymLinkBroken *sxpf.Symbol SymLinkHosted *sxpf.Symbol SymLinkBased *sxpf.Symbol SymLinkQuery *sxpf.Symbol SymLinkExternal *sxpf.Symbol SymListOrdered *sxpf.Symbol SymListUnordered *sxpf.Symbol SymListQuote *sxpf.Symbol SymLiteralProg *sxpf.Symbol SymLiteralComment *sxpf.Symbol SymLiteralHTML *sxpf.Symbol SymLiteralInput *sxpf.Symbol SymLiteralMath *sxpf.Symbol SymLiteralOutput *sxpf.Symbol SymLiteralZettel *sxpf.Symbol SymMark *sxpf.Symbol SymPara *sxpf.Symbol SymRegionBlock *sxpf.Symbol SymRegionQuote *sxpf.Symbol SymRegionVerse *sxpf.Symbol SymSoft *sxpf.Symbol SymSpace *sxpf.Symbol SymTable *sxpf.Symbol SymText *sxpf.Symbol SymThematic *sxpf.Symbol SymTransclude *sxpf.Symbol SymUnknown *sxpf.Symbol SymVerbatimComment *sxpf.Symbol SymVerbatimEval *sxpf.Symbol SymVerbatimHTML *sxpf.Symbol SymVerbatimMath *sxpf.Symbol SymVerbatimProg *sxpf.Symbol SymVerbatimZettel *sxpf.Symbol // Constant symbols for reference states. SymRefStateInvalid *sxpf.Symbol SymRefStateZettel *sxpf.Symbol SymRefStateSelf *sxpf.Symbol SymRefStateFound *sxpf.Symbol SymRefStateBroken *sxpf.Symbol SymRefStateHosted *sxpf.Symbol SymRefStateBased *sxpf.Symbol SymRefStateQuery *sxpf.Symbol SymRefStateExternal *sxpf.Symbol // Symbols for metadata types SymTypeCredential *sxpf.Symbol SymTypeEmpty *sxpf.Symbol SymTypeID *sxpf.Symbol SymTypeIDSet *sxpf.Symbol SymTypeNumber *sxpf.Symbol SymTypeString *sxpf.Symbol SymTypeTagSet *sxpf.Symbol SymTypeTimestamp *sxpf.Symbol SymTypeURL *sxpf.Symbol SymTypeWord *sxpf.Symbol SymTypeWordSet *sxpf.Symbol SymTypeZettelmarkup *sxpf.Symbol } func (zs *ZettelSymbols) InitializeZettelSymbols(sf sxpf.SymbolFactory) { // Symbols for Metanodes zs.SymBlock = sf.MustMake(NameSymBlock) zs.SymInline = sf.MustMake(NameSymInline) zs.SymList = sf.MustMake(NameSymList) zs.SymMeta = sf.MustMake(NameSymMeta) zs.SymQuote = sf.MustMake(NameSymQuote) // Symbols for Zettel node types. zs.SymBLOB = sf.MustMake(NameSymBLOB) zs.SymCell = sf.MustMake(NameSymCell) zs.SymCellCenter = sf.MustMake(NameSymCellCenter) zs.SymCellLeft = sf.MustMake(NameSymCellLeft) zs.SymCellRight = sf.MustMake(NameSymCellRight) zs.SymCite = sf.MustMake(NameSymCite) zs.SymDescription = sf.MustMake(NameSymDescription) zs.SymEmbed = sf.MustMake(NameSymEmbed) zs.SymEmbedBLOB = sf.MustMake(NameSymEmbedBLOB) zs.SymEndnote = sf.MustMake(NameSymEndnote) zs.SymFormatEmph = sf.MustMake(NameSymFormatEmph) zs.SymFormatDelete = sf.MustMake(NameSymFormatDelete) zs.SymFormatInsert = sf.MustMake(NameSymFormatInsert) zs.SymFormatQuote = sf.MustMake(NameSymFormatQuote) zs.SymFormatSpan = sf.MustMake(NameSymFormatSpan) zs.SymFormatSub = sf.MustMake(NameSymFormatSub) zs.SymFormatSuper = sf.MustMake(NameSymFormatSuper) zs.SymFormatStrong = sf.MustMake(NameSymFormatStrong) zs.SymHard = sf.MustMake(NameSymHard) zs.SymHeading = sf.MustMake(NameSymHeading) zs.SymLinkInvalid = sf.MustMake(NameSymLinkInvalid) zs.SymLinkZettel = sf.MustMake(NameSymLinkZettel) zs.SymLinkSelf = sf.MustMake(NameSymLinkSelf) zs.SymLinkFound = sf.MustMake(NameSymLinkFound) zs.SymLinkBroken = sf.MustMake(NameSymLinkBroken) zs.SymLinkHosted = sf.MustMake(NameSymLinkHosted) zs.SymLinkBased = sf.MustMake(NameSymLinkBased) zs.SymLinkQuery = sf.MustMake(NameSymLinkQuery) zs.SymLinkExternal = sf.MustMake(NameSymLinkExternal) zs.SymListOrdered = sf.MustMake(NameSymListOrdered) zs.SymListUnordered = sf.MustMake(NameSymListUnordered) zs.SymListQuote = sf.MustMake(NameSymListQuote) zs.SymLiteralProg = sf.MustMake(NameSymLiteralProg) zs.SymLiteralComment = sf.MustMake(NameSymLiteralComment) zs.SymLiteralHTML = sf.MustMake(NameSymLiteralHTML) zs.SymLiteralInput = sf.MustMake(NameSymLiteralInput) zs.SymLiteralMath = sf.MustMake(NameSymLiteralMath) zs.SymLiteralOutput = sf.MustMake(NameSymLiteralOutput) zs.SymLiteralZettel = sf.MustMake(NameSymLiteralZettel) zs.SymMark = sf.MustMake(NameSymMark) zs.SymPara = sf.MustMake(NameSymPara) zs.SymRegionBlock = sf.MustMake(NameSymRegionBlock) zs.SymRegionQuote = sf.MustMake(NameSymRegionQuote) zs.SymRegionVerse = sf.MustMake(NameSymRegionVerse) zs.SymSoft = sf.MustMake(NameSymSoft) zs.SymSpace = sf.MustMake(NameSymSpace) zs.SymTable = sf.MustMake(NameSymTable) zs.SymText = sf.MustMake(NameSymText) zs.SymThematic = sf.MustMake(NameSymThematic) zs.SymTransclude = sf.MustMake(NameSymTransclude) zs.SymUnknown = sf.MustMake(NameSymUnknown) zs.SymVerbatimComment = sf.MustMake(NameSymVerbatimComment) zs.SymVerbatimEval = sf.MustMake(NameSymVerbatimEval) zs.SymVerbatimHTML = sf.MustMake(NameSymVerbatimHTML) zs.SymVerbatimMath = sf.MustMake(NameSymVerbatimMath) zs.SymVerbatimProg = sf.MustMake(NameSymVerbatimProg) zs.SymVerbatimZettel = sf.MustMake(NameSymVerbatimZettel) // Constant symbols for reference states. zs.SymRefStateInvalid = sf.MustMake(NameSymRefStateInvalid) zs.SymRefStateZettel = sf.MustMake(NameSymRefStateZettel) zs.SymRefStateSelf = sf.MustMake(NameSymRefStateSelf) zs.SymRefStateFound = sf.MustMake(NameSymRefStateFound) zs.SymRefStateBroken = sf.MustMake(NameSymRefStateBroken) zs.SymRefStateHosted = sf.MustMake(NameSymRefStateHosted) zs.SymRefStateBased = sf.MustMake(NameSymRefStateBased) zs.SymRefStateQuery = sf.MustMake(NameSymRefStateQuery) zs.SymRefStateExternal = sf.MustMake(NameSymRefStateExternal) // Symbols for metadata types. zs.SymTypeCredential = sf.MustMake(NameSymTypeCredential) zs.SymTypeEmpty = sf.MustMake(NameSymTypeEmpty) zs.SymTypeID = sf.MustMake(NameSymTypeID) zs.SymTypeIDSet = sf.MustMake(NameSymTypeIDSet) zs.SymTypeNumber = sf.MustMake(NameSymTypeNumber) zs.SymTypeString = sf.MustMake(NameSymTypeString) zs.SymTypeTagSet = sf.MustMake(NameSymTypeTagSet) zs.SymTypeTimestamp = sf.MustMake(NameSymTypeTimestamp) zs.SymTypeURL = sf.MustMake(NameSymTypeURL) zs.SymTypeWord = sf.MustMake(NameSymTypeWord) zs.SymTypeWordSet = sf.MustMake(NameSymTypeWordSet) zs.SymTypeZettelmarkup = sf.MustMake(NameSymTypeZettelmarkup) } |
Added sexpr/const_test.go.
> > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | //----------------------------------------------------------------------------- // Copyright (c) 2023-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package sexpr_test import ( "testing" "codeberg.org/t73fde/sxpf" "zettelstore.de/c/sexpr" ) func BenchmarkInitializeZettelSymbols(b *testing.B) { sf := sxpf.MakeMappedFactory() for i := 0; i < b.N; i++ { var zs sexpr.ZettelSymbols zs.InitializeZettelSymbols(sf) } } |
Added sexpr/sexpr.go.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package sexpr import ( "codeberg.org/t73fde/sxpf" "zettelstore.de/c/attrs" ) // GetAttributes traverses a s-expression list and returns an attribute structure. func GetAttributes(seq *sxpf.List) (result attrs.Attributes) { for elem := seq; elem != nil; elem = elem.Tail() { p, ok := elem.Car().(*sxpf.List) if !ok || p == nil { continue } key := p.Car() if !sxpf.IsAtom(key) { continue } val := p.Cdr() if tail, ok2 := val.(*sxpf.List); ok2 { val = tail.Car() } if !sxpf.IsAtom(val) { continue } result = result.Set(key.String(), val.String()) } return result } // GetMetaContent returns the metadata and the content of a sexpr encoded zettel. func GetMetaContent(zettel sxpf.Object) (Meta, *sxpf.List) { if pair, ok := zettel.(*sxpf.List); ok { m := pair.Car() if s := pair.Tail(); s != nil { if content, ok2 := s.Car().(*sxpf.List); ok2 { return MakeMeta(m), content } } return MakeMeta(m), nil } return nil, nil } type Meta map[string]MetaValue type MetaValue struct { Type string Key string Value sxpf.Object } func MakeMeta(val sxpf.Object) Meta { if result := doMakeMeta(val); len(result) > 0 { return result } return nil } func doMakeMeta(val sxpf.Object) Meta { result := make(map[string]MetaValue) for { if sxpf.IsNil(val) { return result } lst, ok := val.(*sxpf.List) if !ok { return result } if mv, ok2 := makeMetaValue(lst); ok2 { result[mv.Key] = mv } val = lst.Cdr() } } func makeMetaValue(pair *sxpf.List) (MetaValue, bool) { var result MetaValue typePair, ok := pair.Car().(*sxpf.List) if !ok { return result, false } typeVal, ok := typePair.Car().(*sxpf.Symbol) if !ok { return result, false } keyPair, ok := typePair.Cdr().(*sxpf.List) if !ok { return result, false } keyStr, ok := keyPair.Car().(sxpf.String) if !ok { return result, false } valPair, ok := keyPair.Cdr().(*sxpf.List) if !ok { return result, false } result.Type = typeVal.CanonicalName() result.Key = keyStr.String() result.Value = valPair.Car() return result, true } func (m Meta) GetString(key string) string { if v, found := m[key]; found { return v.Value.String() } return "" } func (m Meta) GetList(key string) *sxpf.List { if mv, found := m[key]; found { if seq, ok := mv.Value.(*sxpf.List); ok { return seq } } return nil } |
Deleted shtml/const.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted shtml/lang.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to shtml/shtml.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2023-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | | > > | | | | | | > > > > > > > > | | | > > > | | | > > > > > > > > > > | < < | < < < < | > > | | > > > > > > > > > | | | | | | | | | | < < | | | > > > | < > > | > > | | > > | > > > > > | > | | | | | > > > > | > > > > | | > > > | < < < < | < < | | < | | | < < | | > > | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < | < < < > | | > > | | < < | < < < < | | | < < | > > | > | < < < > > > > > > < < < < < < < | < | < < | < < | < < < < > > > > | | < < | | < < | < | | > < | > > | > > | | < < < < < < < < < < < < < < | | | | | | | | | | | | < | | | | | | | | < < < < < < | < > > > > > > | | < < < | | | | | | < | | | | | | | | | | | | | | | < | | | | | | | < > | | < > | | | | | | > | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | < > | | | | | | | | | | | | > > | > | | | | | | | | | | | | | | | | > | | | | | | | | < < < < < < < | | < | < | | | < | | | > | | | | | | | | < < < | | > > | | | | < | | | | | | | | | | | | > > | > > > | > > | | < < < | | < | | | | < < | | | | | | | < < | | | | | | < < | | | | | < < | | > > > > > > > > > > | < > > | > > > > > | | < | | | | | < | | > | | < < < | | | < < < | > | | | | | | > | > | | | | | | | < | < | | | > > > > > | | < < | | | | | | | < < < < < < < | > > > > > > | | | | < | | | | < | | > | < < < < > > > > > | > | | | | | | > | | < < | | | | < > | | > | | | < < < | < | < < < < < < < < < | | < < | < > > | | | | | | > | | | | | | | | | | | | | | | | | | < < < < < | < < < | > > | | | | < | > | < < < < | > | | < | < | < | < > | > | < > | < < < < | | < > > | | < < | < < < | < < < | > | | < < < < < < < | | > > | | | < < < < < < | | < < | < | | < < < < < < < < < < | < < < < < < < < | | | < | | | > > | > < > | | > | | > > > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 | //----------------------------------------------------------------------------- // Copyright (c) 2023-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- // Package shtml transforms a s-expr encoded zettel AST into a s-expr representation of HTML. package shtml import ( "fmt" "net/url" "strconv" "strings" "codeberg.org/t73fde/sxhtml" "codeberg.org/t73fde/sxpf" "codeberg.org/t73fde/sxpf/builtins/quote" "codeberg.org/t73fde/sxpf/eval" "zettelstore.de/c/api" "zettelstore.de/c/attrs" "zettelstore.de/c/sexpr" "zettelstore.de/c/text" ) // Transformer will transform a s-expression that encodes the zettel AST into an s-expression // that represents HTML. type Transformer struct { sf sxpf.SymbolFactory rebinder RebindProc headingOffset int64 unique string endnotes []endnoteInfo noLinks bool // true iff output must not include links symAttr *sxpf.Symbol symClass *sxpf.Symbol symMeta *sxpf.Symbol symA *sxpf.Symbol symSpan *sxpf.Symbol } type endnoteInfo struct { noteAST *sxpf.List // Endnote as AST noteHx *sxpf.List // Endnote as SxHTML attrs *sxpf.List // attrs a-list } // NewTransformer creates a new transformer object. func NewTransformer(headingOffset int, sf sxpf.SymbolFactory) *Transformer { if sf == nil { sf = sxpf.MakeMappedFactory() } return &Transformer{ sf: sf, rebinder: nil, headingOffset: int64(headingOffset), symAttr: sf.MustMake(sxhtml.NameSymAttr), symClass: sf.MustMake("class"), symMeta: sf.MustMake("meta"), symA: sf.MustMake("a"), symSpan: sf.MustMake("span"), } } // SymbolFactory returns the symbol factory to create HTML symbols. func (tr *Transformer) SymbolFactory() sxpf.SymbolFactory { return tr.sf } // SetUnique sets a prefix to make several HTML ids unique. func (tr *Transformer) SetUnique(s string) { tr.unique = s } // IsValidName returns true, if name is a valid symbol name. func (tr *Transformer) IsValidName(s string) bool { return tr.sf.IsValidName(s) } // Make a new HTML symbol. func (tr *Transformer) Make(s string) *sxpf.Symbol { return tr.sf.MustMake(s) } // RebindProc is a procedure which is called every time before a tranformation takes place. type RebindProc func(*TransformEnv) // SetRebinder sets the rebinder procedure. func (tr *Transformer) SetRebinder(rb RebindProc) { tr.rebinder = rb } // TransformAttrbute transforms the given attributes into a HTML s-expression. func (tr *Transformer) TransformAttrbute(a attrs.Attributes) *sxpf.List { if len(a) == 0 { return sxpf.Nil() } plist := sxpf.Nil() keys := a.Keys() for i := len(keys) - 1; i >= 0; i-- { key := keys[i] if key != attrs.DefaultAttribute && tr.IsValidName(key) { plist = plist.Cons(sxpf.Cons(tr.Make(key), sxpf.MakeString(a[key]))) } } if plist == nil { return sxpf.Nil() } return plist.Cons(tr.symAttr) } // TransformMeta creates a HTML meta s-expression func (tr *Transformer) TransformMeta(a attrs.Attributes) *sxpf.List { return sxpf.Nil().Cons(tr.TransformAttrbute(a)).Cons(tr.symMeta) } // Transform an AST s-expression into a list of HTML s-expressions. func (tr *Transformer) Transform(lst *sxpf.List) (*sxpf.List, error) { astSF := sxpf.FindSymbolFactory(lst) if astSF != nil { if astSF == tr.sf { panic("Invalid AST SymbolFactory") } } else { astSF = sxpf.MakeMappedFactory() } astEnv := sxpf.MakeRootEnvironment() engine := eval.MakeEngine(astSF, astEnv, eval.MakeDefaultParser(), eval.MakeSimpleExecutor()) quote.InstallQuote(engine, sexpr.NameSymQuote, nil, 0) te := TransformEnv{ tr: tr, astSF: astSF, astEnv: astEnv, err: nil, textEnc: text.NewEncoder(astSF), } te.initialize() if rb := tr.rebinder; rb != nil { rb(&te) } val, err := engine.Eval(te.astEnv, lst) if err != nil { return sxpf.Nil(), err } res, ok := val.(*sxpf.List) if !ok { panic("Result is not a list") } for i := 0; i < len(tr.endnotes); i++ { // May extend tr.endnotes val, err = engine.Eval(te.astEnv, tr.endnotes[i].noteAST) if err != nil { return res, err } en, ok2 := val.(*sxpf.List) if !ok2 { panic("Endnote is not a list") } tr.endnotes[i].noteHx = en } return res, err } // Endnotes returns a SHTML object with all collected endnotes. func (tr *Transformer) Endnotes() *sxpf.List { if len(tr.endnotes) == 0 { return nil } result := sxpf.Nil().Cons(tr.Make("ol")) currResult := result.AppendBang(sxpf.Nil().Cons(sxpf.Cons(tr.symClass, sxpf.MakeString("zs-endnotes"))).Cons(tr.symAttr)) for i, fni := range tr.endnotes { noteNum := strconv.Itoa(i + 1) noteID := tr.unique + noteNum attrs := fni.attrs.Cons(sxpf.Cons(tr.symClass, sxpf.MakeString("zs-endnote"))). Cons(sxpf.Cons(tr.Make("value"), sxpf.MakeString(noteNum))). Cons(sxpf.Cons(tr.Make("id"), sxpf.MakeString("fn:"+noteID))). Cons(sxpf.Cons(tr.Make("role"), sxpf.MakeString("doc-endnote"))). Cons(tr.symAttr) backref := sxpf.Nil().Cons(sxpf.MakeString("\u21a9\ufe0e")). Cons(sxpf.Nil(). Cons(sxpf.Cons(tr.symClass, sxpf.MakeString("zs-endnote-backref"))). Cons(sxpf.Cons(tr.Make("href"), sxpf.MakeString("#fnref:"+noteID))). Cons(sxpf.Cons(tr.Make("role"), sxpf.MakeString("doc-backlink"))). Cons(tr.symAttr)). Cons(tr.symA) li := sxpf.Nil().Cons(tr.Make("li")) li.AppendBang(attrs). ExtendBang(fni.noteHx). AppendBang(sxpf.MakeString(" ")).AppendBang(backref) currResult = currResult.AppendBang(li) } tr.endnotes = nil return result } // TransformEnv is the environment where the actual transformation takes places. type TransformEnv struct { tr *Transformer astSF sxpf.SymbolFactory astEnv sxpf.Environment err error textEnc *text.Encoder symNoEscape *sxpf.Symbol symAttr *sxpf.Symbol symMeta *sxpf.Symbol symA *sxpf.Symbol symSpan *sxpf.Symbol symP *sxpf.Symbol } func (te *TransformEnv) initialize() { te.symNoEscape = te.Make(sxhtml.NameSymNoEscape) te.symAttr = te.tr.symAttr te.symMeta = te.tr.symMeta te.symA = te.tr.symA te.symSpan = te.tr.symSpan te.symP = te.Make("p") te.bind(sexpr.NameSymList, 0, listArgs) te.bindMetadata() te.bindBlocks() te.bindInlines() } func listArgs(args *sxpf.List) sxpf.Object { return args } func (te *TransformEnv) bindMetadata() { te.bind(sexpr.NameSymMeta, 0, listArgs) te.bind(sexpr.NameSymTypeZettelmarkup, 2, func(args *sxpf.List) sxpf.Object { a := make(attrs.Attributes, 2). Set("name", te.getString(args).String()). Set("content", te.textEnc.Encode(te.getList(args.Tail()))) return te.transformMeta(a) }) metaString := func(args *sxpf.List) sxpf.Object { a := make(attrs.Attributes, 2). Set("name", te.getString(args).String()). Set("content", te.getString(args.Tail()).String()) return te.transformMeta(a) } te.bind(sexpr.NameSymTypeCredential, 2, metaString) te.bind(sexpr.NameSymTypeEmpty, 2, metaString) te.bind(sexpr.NameSymTypeID, 2, metaString) te.bind(sexpr.NameSymTypeNumber, 2, metaString) te.bind(sexpr.NameSymTypeString, 2, metaString) te.bind(sexpr.NameSymTypeTimestamp, 2, metaString) te.bind(sexpr.NameSymTypeURL, 2, metaString) te.bind(sexpr.NameSymTypeWord, 2, metaString) metaSet := func(args *sxpf.List) sxpf.Object { var sb strings.Builder for elem := te.getList(args.Tail()); elem != nil; elem = elem.Tail() { sb.WriteByte(' ') sb.WriteString(te.getString(elem).String()) } s := sb.String() if len(s) > 0 { s = s[1:] } a := make(attrs.Attributes, 2). Set("name", te.getString(args).String()). Set("content", s) return te.transformMeta(a) } te.bind(sexpr.NameSymTypeIDSet, 2, metaSet) te.bind(sexpr.NameSymTypeTagSet, 2, metaSet) te.bind(sexpr.NameSymTypeWordSet, 2, metaSet) } func (te *TransformEnv) bindBlocks() { te.bind(sexpr.NameSymBlock, 0, listArgs) te.bind(sexpr.NameSymPara, 0, func(args *sxpf.List) sxpf.Object { for ; args != nil; args = args.Tail() { lst, ok := sxpf.GetList(args.Car()) if !ok || lst != nil { break } } return args.Cons(te.symP) }) te.bind(sexpr.NameSymHeading, 5, func(args *sxpf.List) sxpf.Object { nLevel := te.getInt64(args) if nLevel <= 0 { te.err = fmt.Errorf("%v is a negative level", nLevel) return sxpf.Nil() } level := strconv.FormatInt(nLevel+te.tr.headingOffset, 10) argAttr := args.Tail() a := te.getAttributes(argAttr) argFragment := argAttr.Tail().Tail() if fragment := te.getString(argFragment).String(); fragment != "" { a = a.Set("id", te.tr.unique+fragment) } if result, ok := sxpf.GetList(argFragment.Tail().Car()); ok && result != nil { if len(a) > 0 { result = result.Cons(te.transformAttribute(a)) } return result.Cons(te.Make("h" + level)) } return sxpf.MakeList(te.Make("h"+level), sxpf.MakeString("<MISSING TEXT>")) }) te.bind(sexpr.NameSymThematic, 0, func(args *sxpf.List) sxpf.Object { result := sxpf.Nil() if args != nil { if attrList := te.getList(args); attrList != nil { result = result.Cons(te.transformAttribute(sexpr.GetAttributes(attrList))) } } return result.Cons(te.Make("hr")) }) te.bind(sexpr.NameSymListOrdered, 0, te.makeListFn("ol")) te.bind(sexpr.NameSymListUnordered, 0, te.makeListFn("ul")) te.bind(sexpr.NameSymDescription, 0, func(args *sxpf.List) sxpf.Object { if args == nil { return sxpf.Nil() } items := sxpf.Nil().Cons(te.Make("dl")) curItem := items for elem := args; elem != nil; elem = elem.Tail() { term := te.getList(elem) curItem = curItem.AppendBang(term.Cons(te.Make("dt"))) elem = elem.Tail() if elem == nil { break } ddBlock := te.getList(elem) if ddBlock == nil { break } for ddlst := ddBlock; ddlst != nil; ddlst = ddlst.Tail() { dditem := te.getList(ddlst) curItem = curItem.AppendBang(dditem.Cons(te.Make("dd"))) } } return items }) te.bind(sexpr.NameSymListQuote, 0, func(args *sxpf.List) sxpf.Object { if args == nil { return sxpf.Nil() } result := sxpf.Nil().Cons(te.Make("blockquote")) currResult := result for elem := args; elem != nil; elem = elem.Tail() { if quote, ok := elem.Car().(*sxpf.List); ok { currResult = currResult.AppendBang(quote.Cons(te.symP)) } } return result }) te.bind(sexpr.NameSymTable, 1, func(args *sxpf.List) sxpf.Object { thead := sxpf.Nil() if header := te.getList(args); header != nil { thead = sxpf.Nil().Cons(te.transformTableRow(header)).Cons(te.Make("thead")) } tbody := sxpf.Nil() if argBody := args.Tail(); argBody != nil { tbody = sxpf.Nil().Cons(te.Make("tbody")) curBody := tbody for row := argBody; row != nil; row = row.Tail() { curBody = curBody.AppendBang(te.transformTableRow(te.getList(row))) } } table := sxpf.Nil() if tbody != nil { table = table.Cons(tbody) } if thead != nil { table = table.Cons(thead) } if table == nil { return sxpf.Nil() } return table.Cons(te.Make("table")) }) te.bind(sexpr.NameSymCell, 0, te.makeCellFn("")) te.bind(sexpr.NameSymCellCenter, 0, te.makeCellFn("center")) te.bind(sexpr.NameSymCellLeft, 0, te.makeCellFn("left")) te.bind(sexpr.NameSymCellRight, 0, te.makeCellFn("right")) te.bind(sexpr.NameSymRegionBlock, 2, te.makeRegionFn(te.Make("div"), true)) te.bind(sexpr.NameSymRegionQuote, 2, te.makeRegionFn(te.Make("blockquote"), false)) te.bind(sexpr.NameSymRegionVerse, 2, te.makeRegionFn(te.Make("div"), false)) te.bind(sexpr.NameSymVerbatimComment, 1, func(args *sxpf.List) sxpf.Object { if te.getAttributes(args).HasDefault() { if s := te.getString(args.Tail()); s != "" { t := sxpf.MakeString(s.String()) return sxpf.Nil().Cons(t).Cons(te.Make(sxhtml.NameSymBlockComment)) } } return nil }) te.bind(sexpr.NameSymVerbatimEval, 2, func(args *sxpf.List) sxpf.Object { return te.transformVerbatim(te.getAttributes(args).AddClass("zs-eval"), te.getString(args.Tail())) }) te.bind(sexpr.NameSymVerbatimHTML, 2, te.transformHTML) te.bind(sexpr.NameSymVerbatimMath, 2, func(args *sxpf.List) sxpf.Object { return te.transformVerbatim(te.getAttributes(args).AddClass("zs-math"), te.getString(args.Tail())) }) te.bind(sexpr.NameSymVerbatimProg, 2, func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) content := te.getString(args.Tail()) if a.HasDefault() { content = sxpf.MakeString(visibleReplacer.Replace(content.String())) } return te.transformVerbatim(a, content) }) te.bind(sexpr.NameSymVerbatimZettel, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil() }) te.bind(sexpr.NameSymBLOB, 3, func(args *sxpf.List) sxpf.Object { argSyntax := args.Tail() return te.transformBLOB(te.getList(args), te.getString(argSyntax), te.getString(argSyntax.Tail())) }) te.bind(sexpr.NameSymTransclude, 2, func(args *sxpf.List) sxpf.Object { ref, ok := args.Tail().Car().(*sxpf.List) if !ok { return sxpf.Nil() } refKind := ref.Car() if sxpf.IsNil(refKind) { return sxpf.Nil() } if refValue := te.getString(ref.Tail()); refValue != "" { if te.astSF.MustMake(sexpr.NameSymRefStateExternal).IsEqual(refKind) { a := te.getAttributes(args).Set("src", refValue.String()).AddClass("external") return sxpf.Nil().Cons(sxpf.Nil().Cons(te.transformAttribute(a)).Cons(te.Make("img"))).Cons(te.symP) } return sxpf.MakeList( te.Make(sxhtml.NameSymInlineComment), sxpf.MakeString("transclude"), refKind, sxpf.MakeString("->"), refValue, ) } return args }) } func (te *TransformEnv) makeListFn(tag string) transformFn { sym := te.Make(tag) return func(args *sxpf.List) sxpf.Object { result := sxpf.Nil().Cons(sym) last := result for elem := args; elem != nil; elem = elem.Tail() { item := sxpf.Nil().Cons(te.Make("li")) if res, ok := elem.Car().(*sxpf.List); ok { item.ExtendBang(res) } last = last.AppendBang(item) } return result } } func (te *TransformEnv) transformTableRow(cells *sxpf.List) *sxpf.List { row := sxpf.Nil().Cons(te.Make("tr")) if cells == nil { return sxpf.Nil() } curRow := row for cell := cells; cell != nil; cell = cell.Tail() { curRow = curRow.AppendBang(cell.Car()) } return row } func (te *TransformEnv) makeCellFn(align string) transformFn { return func(args *sxpf.List) sxpf.Object { tdata := args if align != "" { tdata = tdata.Cons(te.transformAttribute(attrs.Attributes{"class": align})) } return tdata.Cons(te.Make("td")) } } func (te *TransformEnv) makeRegionFn(sym *sxpf.Symbol, genericToClass bool) transformFn { return func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) if genericToClass { if val, found := a.Get(""); found { a = a.Remove("").AddClass(val) } } result := sxpf.Nil() if len(a) > 0 { result = result.Cons(te.transformAttribute(a)) } result = result.Cons(sym) currResult := result.Last() blockArg := args.Tail() if region, ok := blockArg.Car().(*sxpf.List); ok { currResult = currResult.ExtendBang(region) } if citeArg := blockArg.Tail(); citeArg != nil { if cite, ok := citeArg.Car().(*sxpf.List); ok && cite != nil { currResult.AppendBang(cite.Cons(te.Make("cite"))) } } return result } } func (te *TransformEnv) transformVerbatim(a attrs.Attributes, s sxpf.String) sxpf.Object { a = setProgLang(a) code := sxpf.Nil().Cons(s) if al := te.transformAttribute(a); al != nil { code = code.Cons(al) } code = code.Cons(te.Make("code")) return sxpf.Nil().Cons(code).Cons(te.Make("pre")) } func (te *TransformEnv) bindInlines() { te.bind(sexpr.NameSymInline, 0, listArgs) te.bind(sexpr.NameSymText, 1, func(args *sxpf.List) sxpf.Object { return te.getString(args) }) te.bind(sexpr.NameSymSpace, 0, func(args *sxpf.List) sxpf.Object { if args.IsNil() { return sxpf.MakeString(" ") } return te.getString(args) }) te.bind(sexpr.NameSymSoft, 0, func(*sxpf.List) sxpf.Object { return sxpf.MakeString(" ") }) brSym := te.Make("br") te.bind(sexpr.NameSymHard, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil().Cons(brSym) }) te.bind(sexpr.NameSymLinkInvalid, 2, func(args *sxpf.List) sxpf.Object { // a := te.getAttributes(args) refArg := args.Tail() inline := refArg.Tail() if inline == nil { inline = sxpf.Nil().Cons(refArg.Car()) } return inline.Cons(te.symSpan) }) transformHREF := func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) refValue := te.getString(args.Tail()) return te.transformLink(a.Set("href", refValue.String()), refValue, args.Tail().Tail()) } te.bind(sexpr.NameSymLinkZettel, 2, transformHREF) te.bind(sexpr.NameSymLinkSelf, 2, transformHREF) te.bind(sexpr.NameSymLinkFound, 2, transformHREF) te.bind(sexpr.NameSymLinkBroken, 2, func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) refValue := te.getString(args.Tail()) return te.transformLink(a.AddClass("broken"), refValue, args.Tail().Tail()) }) te.bind(sexpr.NameSymLinkHosted, 2, transformHREF) te.bind(sexpr.NameSymLinkBased, 2, transformHREF) te.bind(sexpr.NameSymLinkQuery, 2, func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) refValue := te.getString(args.Tail()) query := "?" + api.QueryKeyQuery + "=" + url.QueryEscape(refValue.String()) return te.transformLink(a.Set("href", query), refValue, args.Tail().Tail()) }) te.bind(sexpr.NameSymLinkExternal, 2, func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) refValue := te.getString(args.Tail()) return te.transformLink(a.Set("href", refValue.String()).AddClass("external"), refValue, args.Tail().Tail()) }) te.bind(sexpr.NameSymEmbed, 3, func(args *sxpf.List) sxpf.Object { argRef := args.Tail() ref := te.getList(argRef) syntax := te.getString(argRef.Tail()) if syntax == api.ValueSyntaxSVG { embedAttr := sxpf.MakeList( te.symAttr, sxpf.Cons(te.Make("type"), sxpf.MakeString("image/svg+xml")), sxpf.Cons(te.Make("src"), sxpf.MakeString("/"+te.getString(ref.Tail()).String()+".svg")), ) return sxpf.MakeList( te.Make("figure"), sxpf.MakeList( te.Make("embed"), embedAttr, ), ) } a := te.getAttributes(args) a = a.Set("src", string(te.getString(ref.Tail()))) var sb strings.Builder te.flattenText(&sb, ref.Tail().Tail().Tail()) if d := sb.String(); d != "" { a = a.Set("alt", d) } return sxpf.MakeList(te.Make("img"), te.transformAttribute(a)) }) te.bind(sexpr.NameSymEmbedBLOB, 3, func(args *sxpf.List) sxpf.Object { argSyntax := args.Tail() a, syntax, data := te.getAttributes(args), te.getString(argSyntax), te.getString(argSyntax.Tail()) summary, _ := a.Get(api.KeySummary) return te.transformBLOB( sxpf.MakeList(te.astSF.MustMake(sexpr.NameSymInline), sxpf.MakeString(summary)), syntax, data, ) }) te.bind(sexpr.NameSymCite, 2, func(args *sxpf.List) sxpf.Object { result := sxpf.Nil() argKey := args.Tail() if key := te.getString(argKey); key != "" { if text := argKey.Tail(); text != nil { result = text.Cons(sxpf.MakeString(", ")) } result = result.Cons(key) } if a := te.getAttributes(args); len(a) > 0 { result = result.Cons(te.transformAttribute(a)) } if result == nil { return nil } return result.Cons(te.symSpan) }) te.bind(sexpr.NameSymMark, 3, func(args *sxpf.List) sxpf.Object { argFragment := args.Tail().Tail() result := argFragment.Tail() if !te.tr.noLinks { if fragment := te.getString(argFragment); fragment != "" { a := attrs.Attributes{"id": fragment.String() + te.tr.unique} return result.Cons(te.transformAttribute(a)).Cons(te.symA) } } return result.Cons(te.symSpan) }) te.bind(sexpr.NameSymEndnote, 1, func(args *sxpf.List) sxpf.Object { attrPlist := sxpf.Nil() if a := te.getAttributes(args); len(a) > 0 { if attrs := te.transformAttribute(a); attrs != nil { attrPlist = attrs.Tail() } } text, ok := args.Tail().Car().(*sxpf.List) if !ok { return sxpf.Nil() } te.tr.endnotes = append(te.tr.endnotes, endnoteInfo{noteAST: text, noteHx: nil, attrs: attrPlist}) noteNum := strconv.Itoa(len(te.tr.endnotes)) noteID := te.tr.unique + noteNum hrefAttr := sxpf.Nil().Cons(sxpf.Cons(te.Make("role"), sxpf.MakeString("doc-noteref"))). Cons(sxpf.Cons(te.Make("href"), sxpf.MakeString("#fn:"+noteID))). Cons(sxpf.Cons(te.tr.symClass, sxpf.MakeString("zs-noteref"))). Cons(te.symAttr) href := sxpf.Nil().Cons(sxpf.MakeString(noteNum)).Cons(hrefAttr).Cons(te.symA) supAttr := sxpf.Nil().Cons(sxpf.Cons(te.Make("id"), sxpf.MakeString("fnref:"+noteID))).Cons(te.symAttr) return sxpf.Nil().Cons(href).Cons(supAttr).Cons(te.Make("sup")) }) te.bind(sexpr.NameSymFormatDelete, 1, te.makeFormatFn("del")) te.bind(sexpr.NameSymFormatEmph, 1, te.makeFormatFn("em")) te.bind(sexpr.NameSymFormatInsert, 1, te.makeFormatFn("ins")) te.bind(sexpr.NameSymFormatQuote, 1, te.transformQuote) te.bind(sexpr.NameSymFormatSpan, 1, te.makeFormatFn("span")) te.bind(sexpr.NameSymFormatStrong, 1, te.makeFormatFn("strong")) te.bind(sexpr.NameSymFormatSub, 1, te.makeFormatFn("sub")) te.bind(sexpr.NameSymFormatSuper, 1, te.makeFormatFn("sup")) te.bind(sexpr.NameSymLiteralComment, 1, func(args *sxpf.List) sxpf.Object { if te.getAttributes(args).HasDefault() { if s := te.getString(args.Tail()); s != "" { return sxpf.Nil().Cons(s).Cons(te.Make(sxhtml.NameSymInlineComment)) } } return sxpf.Nil() }) te.bind(sexpr.NameSymLiteralHTML, 2, te.transformHTML) kbdSym := te.Make("kbd") te.bind(sexpr.NameSymLiteralInput, 2, func(args *sxpf.List) sxpf.Object { return te.transformLiteral(args, nil, kbdSym) }) codeSym := te.Make("code") te.bind(sexpr.NameSymLiteralMath, 2, func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args).AddClass("zs-math") return te.transformLiteral(args, a, codeSym) }) sampSym := te.Make("samp") te.bind(sexpr.NameSymLiteralOutput, 2, func(args *sxpf.List) sxpf.Object { return te.transformLiteral(args, nil, sampSym) }) te.bind(sexpr.NameSymLiteralProg, 2, func(args *sxpf.List) sxpf.Object { return te.transformLiteral(args, nil, codeSym) }) te.bind(sexpr.NameSymLiteralZettel, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil() }) } func (te *TransformEnv) makeFormatFn(tag string) transformFn { sym := te.Make(tag) return func(args *sxpf.List) sxpf.Object { a := te.getAttributes(args) if val, found := a.Get(""); found { a = a.Remove("").AddClass(val) } res := args.Tail() if len(a) > 0 { res = res.Cons(te.transformAttribute(a)) } return res.Cons(sym) } } func (te *TransformEnv) transformQuote(args *sxpf.List) sxpf.Object { const langAttr = "lang" a := te.getAttributes(args) langVal, found := a.Get(langAttr) if found { a = a.Remove(langAttr) } if val, found2 := a.Get(""); found2 { a = a.Remove("").AddClass(val) } res := args.Tail() if len(a) > 0 { res = res.Cons(te.transformAttribute(a)) } res = res.Cons(te.Make("q")) if found { res = sxpf.Nil().Cons(res).Cons(te.transformAttribute(attrs.Attributes{}.Set(langAttr, langVal))).Cons(te.symSpan) } return res } var visibleReplacer = strings.NewReplacer(" ", "\u2423") func (te *TransformEnv) transformLiteral(args *sxpf.List, a attrs.Attributes, sym *sxpf.Symbol) sxpf.Object { if a == nil { a = te.getAttributes(args) } a = setProgLang(a) literal := te.getString(args.Tail()).String() if a.HasDefault() { a = a.RemoveDefault() literal = visibleReplacer.Replace(literal) } res := sxpf.Nil().Cons(sxpf.MakeString(literal)) if len(a) > 0 { res = res.Cons(te.transformAttribute(a)) } return res.Cons(sym) } func setProgLang(a attrs.Attributes) attrs.Attributes { if val, found := a.Get(""); found { a = a.AddClass("language-" + val).Remove("") } return a } func (te *TransformEnv) transformHTML(args *sxpf.List) sxpf.Object { if s := te.getString(args.Tail()); s != "" && IsSafe(s.String()) { return sxpf.Nil().Cons(s).Cons(te.symNoEscape) } return nil } func (te *TransformEnv) transformBLOB(description *sxpf.List, syntax, data sxpf.String) sxpf.Object { if data == "" { return sxpf.Nil() } switch syntax { case "": return sxpf.Nil() case api.ValueSyntaxSVG: return sxpf.Nil().Cons(sxpf.Nil().Cons(data).Cons(te.symNoEscape)).Cons(te.symP) default: imgAttr := sxpf.Nil().Cons(sxpf.Cons(te.Make("src"), sxpf.MakeString("data:image/"+syntax.String()+";base64,"+data.String()))) var sb strings.Builder te.flattenText(&sb, description) if d := sb.String(); d != "" { imgAttr = imgAttr.Cons(sxpf.Cons(te.Make("alt"), sxpf.MakeString(d))) } return sxpf.Nil().Cons(sxpf.Nil().Cons(imgAttr.Cons(te.symAttr)).Cons(te.Make("img"))).Cons(te.symP) } } func (te *TransformEnv) flattenText(sb *strings.Builder, lst *sxpf.List) { for elem := lst; elem != nil; elem = elem.Tail() { switch obj := elem.Car().(type) { case sxpf.String: sb.WriteString(obj.String()) case *sxpf.List: te.flattenText(sb, obj) } } } type transformFn func(*sxpf.List) sxpf.Object func (te *TransformEnv) bind(name string, minArity int, fn transformFn) { te.astEnv.Bind(te.astSF.MustMake(name), eval.MakeBuiltin(name, func(_ sxpf.Environment, args *sxpf.List) (sxpf.Object, error) { if nArgs := args.Length(); nArgs < minArity { return sxpf.Nil(), fmt.Errorf("not enough arguments (%d) for form %v (%d)", nArgs, name, minArity) } res := fn(args) return res, te.err })) } func (te *TransformEnv) Rebind(name string, fn func(sxpf.Environment, *sxpf.List, sxpf.Callable) sxpf.Object) { sym := te.astSF.MustMake(name) obj, found := te.astEnv.Lookup(sym) if !found { panic(sym.String()) } preFn, ok := obj.(sxpf.Callable) if !ok { panic(sym.String()) } te.astEnv.Bind(sym, eval.MakeBuiltin(name, func(env sxpf.Environment, args *sxpf.List) (sxpf.Object, error) { res := fn(env, args, preFn) return res, te.err })) } func (te *TransformEnv) Make(name string) *sxpf.Symbol { return te.tr.Make(name) } func (te *TransformEnv) getString(lst *sxpf.List) sxpf.String { if te.err != nil { return "" } val := lst.Car() if s, ok := val.(sxpf.String); ok { return s } te.err = fmt.Errorf("%v/%T is not a string", val, val) return "" } func (te *TransformEnv) getInt64(lst *sxpf.List) int64 { if te.err != nil { return -1017 } val := lst.Car() if num, ok := val.(*sxpf.Number); ok { return num.GetInt64() } te.err = fmt.Errorf("%v/%T is not a number", val, val) return -1017 } func (te *TransformEnv) getList(lst *sxpf.List) *sxpf.List { if te.err == nil { val := lst.Car() if res, ok := val.(*sxpf.List); ok { return res } te.err = fmt.Errorf("%v/%T is not a list", val, val) } return sxpf.Nil() } func (te *TransformEnv) getAttributes(args *sxpf.List) attrs.Attributes { return sexpr.GetAttributes(te.getList(args)) } func (te *TransformEnv) transformLink(a attrs.Attributes, refValue sxpf.String, inline *sxpf.List) sxpf.Object { result := inline if inline.IsNil() { result = sxpf.Nil().Cons(refValue) } if te.tr.noLinks { return result.Cons(te.symSpan) } return result.Cons(te.transformAttribute(a)).Cons(te.symA) } func (te *TransformEnv) transformAttribute(a attrs.Attributes) *sxpf.List { return te.tr.TransformAttrbute(a) } func (te *TransformEnv) transformMeta(a attrs.Attributes) *sxpf.List { return te.tr.TransformMeta(a) } var unsafeSnippets = []string{ "<script", "</script", "<iframe", "</iframe", } |
︙ | ︙ |
Deleted sz/const.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/parser.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/parser_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/sz.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/walk.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/block.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/inline.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/post-processor.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/ref.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/ref_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/zmk.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/zmk_fuzz_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted sz/zmk/zmk_test.go.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to text/text.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | < | > | > > > > > | | | > > > > | > > > > > < | | > | | > | > | | | | | | | < < < < | < | < < < < < < | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- // Package text provides types, constants and function to work with text output. package text import ( "strings" "codeberg.org/t73fde/sxpf" "zettelstore.de/c/sexpr" ) // Encoder is the structure to hold relevant data to execute the encoding. type Encoder struct { sf sxpf.SymbolFactory sb strings.Builder symText *sxpf.Symbol symSpace *sxpf.Symbol symSoft *sxpf.Symbol symHard *sxpf.Symbol symQuote *sxpf.Symbol } func NewEncoder(sf sxpf.SymbolFactory) *Encoder { if sf == nil { return nil } enc := &Encoder{ sf: sf, sb: strings.Builder{}, symText: sf.MustMake(sexpr.NameSymText), symSpace: sf.MustMake(sexpr.NameSymSpace), symSoft: sf.MustMake(sexpr.NameSymSoft), symHard: sf.MustMake(sexpr.NameSymHard), symQuote: sf.MustMake(sexpr.NameSymQuote), } return enc } func (enc *Encoder) Encode(lst *sxpf.List) string { enc.executeList(lst) result := enc.sb.String() enc.sb.Reset() return result } // EvaluateInlineString returns the text content of the given inline list as a string. func EvaluateInlineString(lst *sxpf.List) string { if sf := sxpf.FindSymbolFactory(lst); sf != nil { return NewEncoder(sf).Encode(lst) } return "" } func (enc *Encoder) executeList(lst *sxpf.List) { for elem := lst; elem != nil; elem = elem.Tail() { enc.execute(elem.Car()) } } func (enc *Encoder) execute(obj sxpf.Object) { cmd, ok := obj.(*sxpf.List) if !ok { return } sym := cmd.Car() if sxpf.IsNil(sym) { return } if sym.IsEqual(enc.symText) { args := cmd.Tail() if args == nil { return } if val, ok2 := args.Car().(sxpf.String); ok2 { enc.sb.WriteString(val.String()) } } else if sym.IsEqual(enc.symSpace) || sym.IsEqual(enc.symSoft) { enc.sb.WriteByte(' ') } else if sym.IsEqual(enc.symHard) { enc.sb.WriteByte('\n') } else if !sym.IsEqual(enc.symQuote) { enc.executeList(cmd.Tail()) } } |
Changes to text/text_test.go.
1 2 3 4 5 6 7 8 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. | < < < | | | | | < | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | //----------------------------------------------------------------------------- // Copyright (c) 2022-present Detlef Stern // // This file is part of zettelstore-client. // // Zettelstore client is licensed under the latest version of the EUPL // (European Union Public License). Please see file LICENSE.txt for your rights // and obligations under this license. //----------------------------------------------------------------------------- package text_test import ( "strings" "testing" "codeberg.org/t73fde/sxpf" "codeberg.org/t73fde/sxpf/reader" "zettelstore.de/c/text" ) func TestSexprText(t *testing.T) { testcases := []struct { src string exp string }{ {"()", ""}, {`(INLINE (TEXT "a"))`, "a"}, {`(INLINE (SPACE "a"))`, " "}, } for i, tc := range testcases { sval, err := reader.MakeReader(strings.NewReader(tc.src)).Read() if err != nil { t.Error(err) continue } seq, ok := sval.(*sxpf.List) if !ok { t.Errorf("%d: not a list: %v", i, sval) } got := text.EvaluateInlineString(seq) if got != tc.exp { t.Errorf("%d: EncodeBlock(%q) == %q, but got %q", i, tc.src, tc.exp, got) } } |
︙ | ︙ |
Changes to www/changes.wiki.
1 2 | <title>Change Log</title> | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | 1 2 3 4 5 6 7 8 9 10 11 | <title>Change Log</title> <a name="0_12"></a> <h2>Changes for Version 0.12.0 (pending)</h2> <a name="0_11"></a> <h2>Changes for Version 0.11.0 (2023-03-27)</h2> * Remove all zjson related declarations. * Generate HTML via SxHTML, not manually and direct. <a name="0_10"></a> |
︙ | ︙ |
Changes to www/index.wiki.
1 2 3 4 5 | <title>Home</title> This repository contains Go client software to access [https://zettelstore.de|Zettelstore] via its API. | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 | <title>Home</title> This repository contains Go client software to access [https://zettelstore.de|Zettelstore] via its API. <h3>Latest Release: 0.11.0 (2023-03-27)</h3> * [./changes.wiki#0_11|Change summary] * [/timeline?p=v0.11.0&bt=v0.10.0&y=ci|Check-ins for version 0.11.0], [/vdiff?to=v0.11.0&from=v0.10.0|content diff] * [/timeline?df=v0.11.0&y=ci|Check-ins derived from the 0.11.0 release], [/vdiff?from=v0.11.0&to=trunk|content diff] * [/timeline?t=release|Timeline of all past releases] |