Index: api/api.go ================================================================== --- api/api.go +++ api/api.go @@ -43,85 +43,31 @@ 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"` -} + ZettelMaxRight // Sentinel value +) + +// MetaRights contains the metadata of a zettel, and its rights. +type MetaRights struct { + Meta ZettelMeta + Rights ZettelRights +} + +// ZidMetaRights contains the identifier, the metadata of a zettel, and its rights. +type ZidMetaRights struct { + ID ZettelID + Meta ZettelMeta + Rights ZettelRights +} + +// ZettelData contains all data for a zettel. +type ZettelData struct { + Meta ZettelMeta + Rights ZettelRights + Encoding string + Content string +} + +// Aggregate maps metadata keys to list of zettel identifier. +type Aggregate map[string][]ZettelID Index: api/const.go ================================================================== --- api/const.go +++ api/const.go @@ -27,30 +27,34 @@ 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") + ZidBaseTemplate = ZettelID("00000000010100") + ZidLoginTemplate = ZettelID("00000000010200") + ZidListTemplate = ZettelID("00000000010300") + ZidZettelTemplate = ZettelID("00000000010401") + ZidInfoTemplate = ZettelID("00000000010402") + ZidFormTemplate = ZettelID("00000000010403") + ZidRenameTemplate = ZettelID("00000000010404") + ZidDeleteTemplate = ZettelID("00000000010405") + ZidErrorTemplate = ZettelID("00000000010700") + + // WebUI sxn code zettel are in the range 19000..19999 + ZidSxnStart = ZettelID("00000000019000") + ZidSxnBase = ZettelID("00000000019990") // 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. + ZidBaseCSS = ZettelID("00000000020001") + ZidUserCSS = ZettelID("00000000025001") // WebUI JS zettel are in the range 30000..39999 // WebUI image zettel are in the range 40000..49999 ZidEmoji = ZettelID("00000000040001") + + // Other sxn code zettel are in the range 50000..59999 // Range 90000...99999 is reserved for zettel templates ZidTOCNewTemplate = ZettelID("00000000090000") ZidTemplateNewZettel = ZettelID("00000000090001") ZidTemplateNewUser = ZettelID("00000000090002") @@ -90,21 +94,25 @@ KeyBoxNumber = "box-number" KeyCopyright = "copyright" KeyCreated = "created" KeyCredential = "credential" KeyDead = "dead" + KeyExpire = "expire" KeyFolge = "folge" + KeyFolgeRole = "folge-role" KeyForward = "forward" KeyLang = "lang" KeyLicense = "license" KeyModified = "modified" KeyPrecursor = "precursor" KeyPredecessor = "predecessor" KeyPublished = "published" KeyQuery = "query" KeyReadOnly = "read-only" + KeySubordinates = "subordinates" KeySuccessors = "successors" + KeySuperior = "superior" KeySummary = "summary" KeyURL = "url" KeyUselessFiles = "useless-files" KeyUserID = "user-id" KeyUserRole = "user-role" @@ -115,20 +123,21 @@ const ( ValueFalse = "false" ValueTrue = "true" ValueLangEN = "en" ValueRoleConfiguration = "configuration" + ValueRoleTag = "tag" ValueRoleZettel = "zettel" ValueSyntaxCSS = "css" ValueSyntaxDraw = "draw" ValueSyntaxGif = "gif" ValueSyntaxHTML = "html" ValueSyntaxMarkdown = "markdown" ValueSyntaxMD = "md" - ValueSyntaxMustache = "mustache" ValueSyntaxNone = "none" ValueSyntaxSVG = "svg" + ValueSyntaxSxn = "sxn" ValueSyntaxText = "text" ValueSyntaxZmk = "zmk" ValueUserRoleCreator = "creator" ValueUserRoleOwner = "owner" ValueUserRoleReader = "reader" @@ -151,50 +160,42 @@ ) // 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" + QueryKeyTag = "tag" ) // Supported encoding values. const ( EncodingHTML = "html" EncodingMD = "md" - EncodingSexpr = "sexpr" EncodingSHTML = "shtml" + EncodingSz = "sz" EncodingText = "text" EncodingZMK = "zmk" EncodingPlain = "plain" - EncodingJson = "json" + EncodingData = "data" ) var mapEncodingEnum = map[string]EncodingEnum{ EncodingHTML: EncoderHTML, EncodingMD: EncoderMD, - EncodingSexpr: EncoderSexpr, EncodingSHTML: EncoderSHTML, + EncodingSz: EncoderSz, EncodingText: EncoderText, EncodingZMK: EncoderZmk, EncodingPlain: EncoderPlain, - EncodingJson: EncoderJson, + EncodingData: EncoderData, } var mapEnumEncoding = map[EncodingEnum]string{} func init() { for k, v := range mapEncodingEnum { @@ -216,17 +217,17 @@ // Values for EncoderEnum const ( EncoderUnknown EncodingEnum = iota EncoderHTML EncoderMD - EncoderSexpr EncoderSHTML + EncoderSz EncoderText EncoderZmk EncoderPlain - EncoderJson + EncoderData ) // String representation of an encoder key. func (e EncodingEnum) String() string { if f, ok := mapEnumEncoding[e]; ok { @@ -251,18 +252,43 @@ CommandRefresh = Command("refresh") ) // Supported search operator representations const ( - ActionSeparator = "|" - ExistOperator = "?" - ExistNotOperator = "!?" - SearchOperatorNot = "!" - SearchOperatorHas = ":" - SearchOperatorHasNot = "!:" - SearchOperatorPrefix = ">" - SearchOperatorNoPrefix = "!>" - SearchOperatorSuffix = "<" - SearchOperatorNoSuffix = "!<" - SearchOperatorMatch = "~" - SearchOperatorNoMatch = "!~" + BackwardDirective = "BACKWARD" + ContextDirective = "CONTEXT" + CostDirective = "COST" + ForwardDirective = "FORWARD" + IdentDirective = "IDENT" + ItemsDirective = "ITEMS" + MaxDirective = "MAX" + LimitDirective = "LIMIT" + OffsetDirective = "OFFSET" + OrDirective = "OR" + OrderDirective = "ORDER" + PhraseDirective = "PHRASE" + PickDirective = "PICK" + RandomDirective = "RANDOM" + ReverseDirective = "REVERSE" + UnlinkedDirective = "UNLINKED" + + ActionSeparator = "|" + + ExistOperator = "?" + ExistNotOperator = "!?" + + SearchOperatorNot = "!" + SearchOperatorEqual = "=" + SearchOperatorNotEqual = "!=" + SearchOperatorHas = ":" + SearchOperatorHasNot = "!:" + SearchOperatorPrefix = "[" + SearchOperatorNoPrefix = "![" + SearchOperatorSuffix = "]" + SearchOperatorNoSuffix = "!]" + SearchOperatorMatch = "~" + SearchOperatorNoMatch = "!~" + SearchOperatorLess = "<" + SearchOperatorNotLess = "!<" + SearchOperatorGreater = ">" + SearchOperatorNotGreater = "!>" ) Index: api/urlbuilder.go ================================================================== --- api/urlbuilder.go +++ api/urlbuilder.go @@ -89,12 +89,14 @@ return ub } // AppendQuery adds a new query func (ub *URLBuilder) AppendQuery(value string) *URLBuilder { - ub.rawLocal = "" - ub.query = append(ub.query, urlQuery{QueryKeyQuery, value}) + if value != "" { + ub.rawLocal = "" + ub.query = append(ub.query, urlQuery{QueryKeyQuery, value}) + } return ub } // ClearQuery removes all query parameters. func (ub *URLBuilder) ClearQuery() *URLBuilder { @@ -111,19 +113,10 @@ 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) @@ -144,15 +137,15 @@ } for i, q := range ub.query { if i == 0 { sb.WriteByte('?') } else { - sb.WriteString(qsep) + sb.WriteByte('&') } sb.WriteString(q.key) if val := q.val; val != "" { sb.WriteByte('=') sb.WriteString(url.QueryEscape(val)) } } return sb.String() } Index: attrs/attrs.go ================================================================== --- attrs/attrs.go +++ attrs/attrs.go @@ -12,11 +12,11 @@ package attrs import ( "strings" - "zettelstore.de/c/maps" + "zettelstore.de/client.fossil/maps" ) // Attributes store additional information about some node types. type Attributes map[string]string Index: attrs/attrs_test.go ================================================================== --- attrs/attrs_test.go +++ attrs/attrs_test.go @@ -11,11 +11,11 @@ package attrs_test import ( "testing" - "zettelstore.de/c/attrs" + "zettelstore.de/client.fossil/attrs" ) func TestHasDefault(t *testing.T) { t.Parallel() attr := attrs.Attributes{} Index: client/client.go ================================================================== --- client/client.go +++ client/client.go @@ -13,22 +13,23 @@ import ( "bufio" "bytes" "context" - "encoding/json" + "fmt" "io" "net" "net/http" "net/url" "strconv" "strings" "time" - "codeberg.org/t73fde/sxpf" - "codeberg.org/t73fde/sxpf/reader" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" + "zettelstore.de/client.fossil/sexp" + "zettelstore.de/sx.fossil" + "zettelstore.de/sx.fossil/sxreader" ) // Client contains all data to execute requests. type Client struct { base string @@ -164,19 +165,26 @@ } 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) + rd := sxreader.MakeReader(resp.Body) + obj, err := rd.Read() + if err != nil { + return err + } + vals, err := sexp.ParseList(obj, "ssi") 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) + token := vals[1].(sx.String).String() + if len(token) < 4 { + return fmt.Errorf("no valid token found: %q", token) + } + c.token = token + c.tokenType = vals[0].(sx.String).String() + c.expires = time.Now().Add(time.Duration(vals[2].(sx.Int64)*9/10) * time.Second) return nil } func (c *Client) updateToken(ctx context.Context) error { if c.username == "" { @@ -227,60 +235,51 @@ 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) { +// CreateZettelData creates a new zettel and returns its URL. +func (c *Client) CreateZettelData(ctx context.Context, data api.ZettelData) (api.ZettelID, error) { var buf bytes.Buffer - if err := encodeZettelData(&buf, data); err != nil { + if _, err := sx.Print(&buf, sexp.EncodeZettel(data)); err != nil { return api.InvalidZID, err } - ub := c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) + ub := c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingData) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPost, ub, &buf, nil) if err != nil { return api.InvalidZID, err } defer resp.Body.Close() + rdr := sxreader.MakeReader(resp.Body) + obj, err := rdr.Read() 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) + return makeZettelID(obj) } var bsLF = []byte{'\n'} -// ListZettel returns a list of all Zettel. -func (c *Client) ListZettel(ctx context.Context, query string) ([][]byte, error) { +// QueryZettel returns a list of all Zettel. +func (c *Client) QueryZettel(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() + data, err := io.ReadAll(resp.Body) switch resp.StatusCode { case http.StatusOK: case http.StatusNoContent: + return nil, nil 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 { @@ -287,28 +286,138 @@ 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) +// QueryZettelData returns a list of zettel metadata. +func (c *Client) QueryZettelData(ctx context.Context, query string) (string, string, []api.ZidMetaRights, error) { + ub := c.newURLBuilder('z').AppendKVQuery(api.QueryKeyEncoding, api.EncodingData).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 { + rdr := sxreader.MakeReader(resp.Body) + obj, err := rdr.Read() + switch resp.StatusCode { + case http.StatusOK: + case http.StatusNoContent: + return "", "", nil, nil + default: return "", "", nil, statusToError(resp) } - dec := json.NewDecoder(resp.Body) - var zl api.ZettelListJSON - err = dec.Decode(&zl) + if err != nil { + return "", "", nil, err + } + vals, err := sexp.ParseList(obj, "yppp") + if err != nil { + return "", "", nil, err + } + qVals, err := sexp.ParseList(vals[1], "ys") + if err != nil { + return "", "", nil, err + } + hVals, err := sexp.ParseList(vals[2], "ys") if err != nil { return "", "", nil, err } - return zl.Query, zl.Human, zl.List, nil + metaList, err := parseMetaList(vals[3].(*sx.Pair)) + return qVals[1].String(), hVals[1].String(), metaList, err +} + +func parseMetaList(metaPair *sx.Pair) ([]api.ZidMetaRights, error) { + if metaPair == nil { + return nil, fmt.Errorf("no zettel list") + } + if errSym := sexp.CheckSymbol(metaPair.Car(), "list"); errSym != nil { + return nil, errSym + } + var result []api.ZidMetaRights + for node := metaPair.Cdr(); !sx.IsNil(node); { + elem, isPair := sx.GetPair(node) + if !isPair { + return nil, fmt.Errorf("meta-list not a proper list: %v", metaPair.String()) + } + node = elem.Cdr() + vals, err := sexp.ParseList(elem.Car(), "yppp") + if err != nil { + return nil, err + } + + if errSym := sexp.CheckSymbol(vals[0], "zettel"); errSym != nil { + return nil, errSym + } + + idVals, err := sexp.ParseList(vals[1], "yi") + if err != nil { + return nil, err + } + if errSym := sexp.CheckSymbol(idVals[0], "id"); errSym != nil { + return nil, errSym + } + zid, err := makeZettelID(idVals[1]) + if err != nil { + return nil, err + } + + meta, err := sexp.ParseMeta(vals[2].(*sx.Pair)) + if err != nil { + return nil, err + } + + rights, err := sexp.ParseRights(vals[3]) + if err != nil { + return nil, err + } + + result = append(result, api.ZidMetaRights{ + ID: zid, + Meta: meta, + Rights: rights, + }) + } + return result, nil +} +func makeZettelID(obj sx.Object) (api.ZettelID, error) { + val, isInt64 := obj.(sx.Int64) + if !isInt64 || val <= 0 { + return api.InvalidZID, fmt.Errorf("invalid zettel ID: %v", val) + } + sVal := strconv.FormatInt(int64(val), 10) + if len(sVal) < 14 { + sVal = "00000000000000"[0:14-len(sVal)] + sVal + } + zid := api.ZettelID(sVal) + if !zid.IsValid() { + return api.InvalidZID, fmt.Errorf("invalid zettel ID: %v", val) + } + return zid, nil +} + +// QueryAggregate returns a aggregate as a result of a query. +// It is most often used in a query with an action, where the action is either +// a metadata key of type Word, WordSet, or TagSet. +func (c *Client) QueryAggregate(ctx context.Context, query string) (api.Aggregate, error) { + lines, err := c.QueryZettel(ctx, query) + if err != nil { + return nil, err + } + if len(lines) == 0 { + return nil, nil + } + agg := make(api.Aggregate, len(lines)) + for _, line := range lines { + if fields := bytes.Fields(line); len(fields) > 1 { + key := string(fields[0]) + for _, field := range fields[1:] { + if zid := api.ZettelID(string(field)); zid.IsValid() { + agg[key] = append(agg[key], zid) + } + } + } + } + return agg, 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) @@ -318,39 +427,39 @@ resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, ub, nil, nil) if err != nil { return nil, err } defer resp.Body.Close() + data, err := io.ReadAll(resp.Body) switch resp.StatusCode { case http.StatusOK: case http.StatusNoContent: + return nil, nil default: return nil, statusToError(resp) } - return io.ReadAll(resp.Body) + return data, err } -// GetZettelJSON returns a zettel as a JSON struct. -func (c *Client) GetZettelJSON(ctx context.Context, zid api.ZettelID) (*api.ZettelDataJSON, error) { +// GetZettelData returns a zettel as a struct of its parts. +func (c *Client) GetZettelData(ctx context.Context, zid api.ZettelID) (api.ZettelData, error) { ub := c.newURLBuilder('z').SetZid(zid) - ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) + ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingData) 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 + if err == nil { + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return api.ZettelData{}, statusToError(resp) + } + rdr := sxreader.MakeReader(resp.Body) + obj, err2 := rdr.Read() + if err2 == nil { + return sexp.ParseZettel(obj) + } + } + return api.ZettelData{}, err } // 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) @@ -380,23 +489,23 @@ 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) +// GetParsedSz returns an parsed zettel as a Sexpr-decoded data structure. +func (c *Client) GetParsedSz(ctx context.Context, zid api.ZettelID, part string, sf sx.SymbolFactory) (sx.Object, error) { + return c.getSz(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) +// GetEvaluatedSz returns an evaluated zettel as a Sexpr-decoded data structure. +func (c *Client) GetEvaluatedSz(ctx context.Context, zid api.ZettelID, part string, sf sx.SymbolFactory) (sx.Object, error) { + return c.getSz(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) { +func (c *Client) getSz(ctx context.Context, zid api.ZettelID, part string, parseOnly bool, sf sx.SymbolFactory) (sx.Object, error) { ub := c.newURLBuilder('z').SetZid(zid) - ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingSexpr) + ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingSz) if part != "" { ub.AppendKVQuery(api.QueryKeyPart, part) } if parseOnly { ub.AppendKVQuery(api.QueryKeyParseOnly, "") @@ -407,122 +516,53 @@ } 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() + return sxreader.MakeReader(bufio.NewReaderSize(resp.Body, 8), sxreader.WithSymbolFactory(sf)).Read() } -// GetMeta returns the metadata of a zettel. -func (c *Client) GetMeta(ctx context.Context, zid api.ZettelID) (api.ZettelMeta, error) { +// GetMetaData returns the metadata of a zettel. +func (c *Client) GetMetaData(ctx context.Context, zid api.ZettelID) (api.MetaRights, error) { ub := c.newURLBuilder('z').SetZid(zid) - ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) + ub.AppendKVQuery(api.QueryKeyEncoding, api.EncodingData) 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 + return api.MetaRights{}, err + } + defer resp.Body.Close() + rdr := sxreader.MakeReader(resp.Body) + obj, err := rdr.Read() + if resp.StatusCode != http.StatusOK { + return api.MetaRights{}, statusToError(resp) + } + if err != nil { + return api.MetaRights{}, err + } + vals, err := sexp.ParseList(obj, "ypp") + if err != nil { + return api.MetaRights{}, err + } + if errSym := sexp.CheckSymbol(vals[0], "list"); errSym != nil { + return api.MetaRights{}, err + } + + meta, err := sexp.ParseMeta(vals[1].(*sx.Pair)) + if err != nil { + return api.MetaRights{}, err + } + + rights, err := sexp.ParseRights(vals[2]) + if err != nil { + return api.MetaRights{}, err + } + + return api.MetaRights{ + Meta: meta, + Rights: rights, + }, 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) @@ -535,17 +575,17 @@ return statusToError(resp) } return nil } -// UpdateZettelJSON updates an existing zettel. -func (c *Client) UpdateZettelJSON(ctx context.Context, zid api.ZettelID, data *api.ZettelDataJSON) error { +// UpdateZettelData updates an existing zettel. +func (c *Client) UpdateZettelData(ctx context.Context, zid api.ZettelID, data api.ZettelData) error { var buf bytes.Buffer - if err := encodeZettelData(&buf, data); err != nil { + if _, err := sx.Print(&buf, sexp.EncodeZettel(data)); err != nil { return err } - ub := c.newURLBuilder('z').SetZid(zid).AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson) + ub := c.newURLBuilder('z').SetZid(zid).AppendKVQuery(api.QueryKeyEncoding, api.EncodingData) resp, err := c.buildAndExecuteRequest(ctx, http.MethodPut, ub, &buf, nil) if err != nil { return err } defer resp.Body.Close() @@ -598,64 +638,39 @@ 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 +// GetVersionInfo returns version information.. +func (c *Client) GetVersionInfo(ctx context.Context) (VersionInfo, error) { + resp, err := c.buildAndExecuteRequest(ctx, http.MethodGet, c.newURLBuilder('x'), nil, nil) + if err != nil { + return VersionInfo{}, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return VersionInfo{}, statusToError(resp) + } + rdr := sxreader.MakeReader(resp.Body) + obj, err := rdr.Read() + if err == nil { + if vals, errVals := sexp.ParseList(obj, "iiiss"); errVals == nil { + return VersionInfo{ + Major: int(vals[0].(sx.Int64)), + Minor: int(vals[1].(sx.Int64)), + Patch: int(vals[2].(sx.Int64)), + Info: vals[3].(sx.String).String(), + Hash: vals[4].(sx.String).String(), + }, nil + } + } + return VersionInfo{}, err +} + +// VersionInfo contains version information. +type VersionInfo struct { + Major int + Minor int + Patch int + Info string + Hash string } Index: client/client_test.go ================================================================== --- client/client_test.go +++ client/client_test.go @@ -15,19 +15,19 @@ "flag" "net/http" "net/url" "testing" - "codeberg.org/t73fde/sxpf" - "zettelstore.de/c/api" - "zettelstore.de/c/client" - "zettelstore.de/c/sexpr" + "zettelstore.de/client.fossil/api" + "zettelstore.de/client.fossil/client" + "zettelstore.de/client.fossil/sz" + "zettelstore.de/sx.fossil" ) func TestZettelList(t *testing.T) { c := getClient() - _, err := c.ListZettel(context.Background(), "") + _, err := c.QueryZettel(context.Background(), "") if err != nil { t.Error(err) return } } @@ -43,16 +43,16 @@ } return } } -func TestGetSexprZettel(t *testing.T) { +func TestGetSzZettel(t *testing.T) { c := getClient() - sf := sxpf.MakeMappedFactory() - var zetSyms sexpr.ZettelSymbols + sf := sx.MakeMappedFactory(1024) + var zetSyms sz.ZettelSymbols zetSyms.InitializeZettelSymbols(sf) - value, err := c.GetEvaluatedSexpr(context.Background(), api.ZidDefaultHome, api.PartContent, sf) + value, err := c.GetEvaluatedSz(context.Background(), api.ZidDefaultHome, api.PartContent, sf) if err != nil { t.Error(err) return } if value.IsNil() { Index: go.mod ================================================================== --- go.mod +++ go.mod @@ -1,8 +1,5 @@ -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 -) +module zettelstore.de/client.fossil + +go 1.21 + +require zettelstore.de/sx.fossil v0.0.0-20230915173519-fa23195f2b56 Index: go.sum ================================================================== --- go.sum +++ go.sum @@ -1,4 +1,2 @@ -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= +zettelstore.de/sx.fossil v0.0.0-20230915173519-fa23195f2b56 h1:Y1cw0BCmxDZMImE5c5jGDIOz1XdTpG5/GBBjMkZZUo8= +zettelstore.de/sx.fossil v0.0.0-20230915173519-fa23195f2b56/go.mod h1:Uw3OLM1ufOM4Xe0G51mvkTDUv2okd+HyDBMx+0ZG7ME= Index: maps/maps_test.go ================================================================== --- maps/maps_test.go +++ maps/maps_test.go @@ -11,11 +11,11 @@ package maps_test import ( "testing" - "zettelstore.de/c/maps" + "zettelstore.de/client.fossil/maps" ) func isSorted(seq []string) bool { for i := 1; i < len(seq); i++ { if seq[i] < seq[i-1] { ADDED sexp/sexp.go Index: sexp/sexp.go ================================================================== --- sexp/sexp.go +++ sexp/sexp.go @@ -0,0 +1,203 @@ +//----------------------------------------------------------------------------- +// 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 sexp contains helper function to work with s-expression in an alien +// environment. +package sexp + +import ( + "errors" + "fmt" + "sort" + + "zettelstore.de/client.fossil/api" + "zettelstore.de/sx.fossil" +) + +// EncodeZettel transforms zettel data into a sx object. +func EncodeZettel(zettel api.ZettelData) sx.Object { + sf := sx.MakeMappedFactory(1024) + return sx.MakeList( + sf.MustMake("zettel"), + meta2sz(zettel.Meta, sf), + sx.MakeList(sf.MustMake("rights"), sx.Int64(int64(zettel.Rights))), + sx.MakeList(sf.MustMake("encoding"), sx.String(zettel.Encoding)), + sx.MakeList(sf.MustMake("content"), sx.String(zettel.Content)), + ) +} + +func ParseZettel(obj sx.Object) (api.ZettelData, error) { + vals, err := ParseList(obj, "ypppp") + if err != nil { + return api.ZettelData{}, err + } + if errSym := CheckSymbol(vals[0], "zettel"); errSym != nil { + return api.ZettelData{}, errSym + } + + meta, err := ParseMeta(vals[1].(*sx.Pair)) + if err != nil { + return api.ZettelData{}, err + } + + rights, err := ParseRights(vals[2]) + if err != nil { + return api.ZettelData{}, err + } + + encVals, err := ParseList(vals[3], "ys") + if err != nil { + return api.ZettelData{}, err + } + if errSym := CheckSymbol(encVals[0], "encoding"); errSym != nil { + return api.ZettelData{}, errSym + } + + contentVals, err := ParseList(vals[4], "ys") + if err != nil { + return api.ZettelData{}, err + } + if errSym := CheckSymbol(contentVals[0], "content"); errSym != nil { + return api.ZettelData{}, errSym + } + + return api.ZettelData{ + Meta: meta, + Rights: rights, + Encoding: encVals[1].(sx.String).String(), + Content: contentVals[1].(sx.String).String(), + }, nil +} + +// EncodeMetaRights translates metadata/rights into a sx object. +func EncodeMetaRights(mr api.MetaRights) *sx.Pair { + sf := sx.MakeMappedFactory(1024) + return sx.MakeList( + sf.MustMake("list"), + meta2sz(mr.Meta, sf), + sx.MakeList(sf.MustMake("rights"), sx.Int64(int64(mr.Rights))), + ) +} + +func meta2sz(m api.ZettelMeta, sf sx.SymbolFactory) sx.Object { + result := sx.Nil().Cons(sf.MustMake("meta")) + curr := result + keys := make([]string, 0, len(m)) + for k := range m { + keys = append(keys, k) + } + sort.Strings(keys) + for _, k := range keys { + val := sx.MakeList(sf.MustMake(k), sx.String(m[k])) + curr = curr.AppendBang(val) + } + return result +} + +// ParseMeta translates the given list to metadata. +func ParseMeta(pair *sx.Pair) (api.ZettelMeta, error) { + if err := CheckSymbol(pair.Car(), "meta"); err != nil { + return nil, err + } + res := api.ZettelMeta{} + for node := pair.Tail(); node != nil; node = node.Tail() { + mVals, err := ParseList(node.Car(), "ys") + if err != nil { + return nil, err + } + res[mVals[0].(*sx.Symbol).Name()] = mVals[1].(sx.String).String() + } + return res, nil +} + +// ParseRights returns the rights values of the given object. +func ParseRights(obj sx.Object) (api.ZettelRights, error) { + rVals, err := ParseList(obj, "yi") + if err != nil { + return api.ZettelMaxRight, err + } + if errSym := CheckSymbol(rVals[0], "rights"); errSym != nil { + return api.ZettelMaxRight, errSym + } + i64 := int64(rVals[1].(sx.Int64)) + if i64 < 0 && i64 >= int64(api.ZettelMaxRight) { + return api.ZettelMaxRight, fmt.Errorf("invalid zettel right value: %v", i64) + } + return api.ZettelRights(i64), nil +} + +// ParseList parses the given object as a proper list, based on a type specification. +func ParseList(obj sx.Object, spec string) ([]sx.Object, error) { + pair, isPair := sx.GetPair(obj) + if !isPair { + return nil, fmt.Errorf("not a list: %T/%v", obj, obj) + } + if pair == nil { + if spec == "" { + return nil, nil + } + return nil, ErrElementsMissing + } + + result := make([]sx.Object, 0, len(spec)) + node, i := pair, 0 + for ; node != nil; i++ { + if i >= len(spec) { + return nil, ErrNoSpec + } + var val sx.Object + var ok bool + car := node.Car() + switch spec[i] { + case 'b': + val, ok = sx.MakeBoolean(!sx.IsNil(car)), true + case 'i': + val, ok = car.(sx.Int64) + case 'o': + val, ok = car, true + case 'p': + val, ok = sx.GetPair(car) + case 's': + val, ok = sx.GetString(car) + case 'y': + val, ok = sx.GetSymbol(car) + default: + return nil, fmt.Errorf("unknown spec '%c'", spec[i]) + } + if !ok { + return nil, fmt.Errorf("does not match spec '%v': %v", spec[i], car) + } + result = append(result, val) + next, isNextPair := sx.GetPair(node.Cdr()) + if !isNextPair { + return nil, sx.ErrImproper{Pair: pair} + } + node = next + } + if i < len(spec) { + return nil, ErrElementsMissing + } + return result, nil +} + +var ErrElementsMissing = errors.New("spec contains more data") +var ErrNoSpec = errors.New("no spec for elements") + +// CheckSymbol ensures that the given object is a symbol with the given name. +func CheckSymbol(obj sx.Object, name string) error { + sym, isSymbol := sx.GetSymbol(obj) + if !isSymbol { + return fmt.Errorf("object %v/%T is not a symbol", obj, obj) + } + if got := sym.Name(); got != name { + return fmt.Errorf("symbol %q expected, but got: %q", name, got) + } + return nil +} ADDED sexp/sexp_test.go Index: sexp/sexp_test.go ================================================================== --- sexp/sexp_test.go +++ sexp/sexp_test.go @@ -0,0 +1,54 @@ +//----------------------------------------------------------------------------- +// 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 sexp_test + +import ( + "testing" + + "zettelstore.de/client.fossil/sexp" + "zettelstore.de/sx.fossil" +) + +func TestParseObject(t *testing.T) { + if elems, err := sexp.ParseList(sx.String("a"), "s"); err == nil { + t.Error("expected an error, but got: ", elems) + } + if elems, err := sexp.ParseList(sx.Nil(), ""); err != nil { + t.Error(err) + } else if len(elems) != 0 { + t.Error("Must be empty, but got:", elems) + } + if elems, err := sexp.ParseList(sx.Nil(), "b"); err == nil { + t.Error("expected error, but got: ", elems) + } + + if elems, err := sexp.ParseList(sx.MakeList(sx.String("a")), "ss"); err == nil { + t.Error("expected error, but got: ", elems) + } + if elems, err := sexp.ParseList(sx.MakeList(sx.String("a")), ""); err == nil { + t.Error("expected error, but got: ", elems) + } + if _, err := sexp.ParseList(sx.MakeList(sx.String("a")), "b"); err != nil { + t.Error("expected [1], but got error: ", err) + } + if elems, err := sexp.ParseList(sx.Cons(sx.Nil(), sx.String("a")), "ps"); err == nil { + t.Error("expected error, but got: ", elems) + } + + if elems, err := sexp.ParseList(sx.MakeList(sx.String("a")), "s"); err != nil { + t.Error(err) + } else if len(elems) != 1 { + t.Error("length == 1, but got: ", elems) + } else { + _ = elems[0].(sx.String) + } + +} DELETED sexpr/const.go Index: sexpr/const.go ================================================================== --- sexpr/const.go +++ sexpr/const.go @@ -1,297 +0,0 @@ -//----------------------------------------------------------------------------- -// 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) -} DELETED sexpr/const_test.go Index: sexpr/const_test.go ================================================================== --- sexpr/const_test.go +++ sexpr/const_test.go @@ -1,26 +0,0 @@ -//----------------------------------------------------------------------------- -// 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) - } -} DELETED sexpr/sexpr.go Index: sexpr/sexpr.go ================================================================== --- sexpr/sexpr.go +++ sexpr/sexpr.go @@ -1,126 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 -} Index: shtml/shtml.go ================================================================== --- shtml/shtml.go +++ shtml/shtml.go @@ -15,46 +15,45 @@ "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" + "zettelstore.de/client.fossil/api" + "zettelstore.de/client.fossil/attrs" + "zettelstore.de/client.fossil/sz" + "zettelstore.de/client.fossil/text" + "zettelstore.de/sx.fossil" + "zettelstore.de/sx.fossil/sxeval" + "zettelstore.de/sx.fossil/sxhtml" ) // Transformer will transform a s-expression that encodes the zettel AST into an s-expression // that represents HTML. type Transformer struct { - sf sxpf.SymbolFactory + sf sx.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 + symAttr *sx.Symbol + symClass *sx.Symbol + symMeta *sx.Symbol + symA *sx.Symbol + symSpan *sx.Symbol } type endnoteInfo struct { - noteAST *sxpf.List // Endnote as AST - noteHx *sxpf.List // Endnote as SxHTML - attrs *sxpf.List // attrs a-list + noteAST *sx.Pair // Endnote as AST + noteHx *sx.Pair // Endnote as SxHTML + attrs *sx.Pair // attrs a-list } // NewTransformer creates a new transformer object. -func NewTransformer(headingOffset int, sf sxpf.SymbolFactory) *Transformer { +func NewTransformer(headingOffset int, sf sx.SymbolFactory) *Transformer { if sf == nil { - sf = sxpf.MakeMappedFactory() + sf = sx.MakeMappedFactory(128) } return &Transformer{ sf: sf, rebinder: nil, headingOffset: int64(headingOffset), @@ -65,64 +64,64 @@ symSpan: sf.MustMake("span"), } } // SymbolFactory returns the symbol factory to create HTML symbols. -func (tr *Transformer) SymbolFactory() sxpf.SymbolFactory { return tr.sf } +func (tr *Transformer) SymbolFactory() sx.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) } +func (tr *Transformer) Make(s string) *sx.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 { +func (tr *Transformer) TransformAttrbute(a attrs.Attributes) *sx.Pair { if len(a) == 0 { - return sxpf.Nil() + return nil } - plist := sxpf.Nil() + plist := sx.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]))) + plist = plist.Cons(sx.Cons(tr.Make(key), sx.String(a[key]))) } } if plist == nil { - return sxpf.Nil() + return 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) +func (tr *Transformer) TransformMeta(a attrs.Attributes) *sx.Pair { + return sx.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) +func (tr *Transformer) Transform(lst *sx.Pair) (*sx.Pair, error) { + astSF := sx.FindSymbolFactory(lst) if astSF != nil { if astSF == tr.sf { panic("Invalid AST SymbolFactory") } } else { - astSF = sxpf.MakeMappedFactory() + astSF = sx.MakeMappedFactory(1024) } - astEnv := sxpf.MakeRootEnvironment() - engine := eval.MakeEngine(astSF, astEnv, eval.MakeDefaultParser(), eval.MakeSimpleExecutor()) - quote.InstallQuote(engine, sexpr.NameSymQuote, nil, 0) + astEnv := sxeval.MakeRootEnvironment(128) // approx: number of bindings in te.initialize() + engine := sxeval.MakeEngine(astSF, astEnv) + engine.SetQuote(astSF.MustMake(sz.NameSymQuote)) te := TransformEnv{ tr: tr, astSF: astSF, astEnv: astEnv, err: nil, @@ -133,619 +132,615 @@ rb(&te) } val, err := engine.Eval(te.astEnv, lst) if err != nil { - return sxpf.Nil(), err + return nil, err } - res, ok := val.(*sxpf.List) - if !ok { + res, isPair := sx.GetPair(val) + if !isPair { 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 { + en, ok := sx.GetPair(val) + if !ok { 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 { +func (tr *Transformer) Endnotes() *sx.Pair { 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)) + result := sx.Nil().Cons(tr.Make("ol")) + currResult := result.AppendBang(sx.Nil().Cons(sx.Cons(tr.symClass, sx.String("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"))). + attrs := fni.attrs.Cons(sx.Cons(tr.symClass, sx.String("zs-endnote"))). + Cons(sx.Cons(tr.Make("value"), sx.String(noteNum))). + Cons(sx.Cons(tr.Make("id"), sx.String("fn:"+noteID))). + Cons(sx.Cons(tr.Make("role"), sx.String("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"))). + backref := sx.Nil().Cons(sx.String("\u21a9\ufe0e")). + Cons(sx.Nil(). + Cons(sx.Cons(tr.symClass, sx.String("zs-endnote-backref"))). + Cons(sx.Cons(tr.Make("href"), sx.String("#fnref:"+noteID))). + Cons(sx.Cons(tr.Make("role"), sx.String("doc-backlink"))). Cons(tr.symAttr)). Cons(tr.symA) - li := sxpf.Nil().Cons(tr.Make("li")) + li := sx.Nil().Cons(tr.Make("li")) li.AppendBang(attrs). ExtendBang(fni.noteHx). - AppendBang(sxpf.MakeString(" ")).AppendBang(backref) + AppendBang(sx.String(" ")).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 + astSF sx.SymbolFactory + astEnv sxeval.Environment err error textEnc *text.Encoder - symNoEscape *sxpf.Symbol - symAttr *sxpf.Symbol - symMeta *sxpf.Symbol - symA *sxpf.Symbol - symSpan *sxpf.Symbol - symP *sxpf.Symbol + symNoEscape *sx.Symbol + symAttr *sx.Symbol + symA *sx.Symbol + symSpan *sx.Symbol + symP *sx.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.bind(sz.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()) +func listArgs(args []sx.Object) sx.Object { return sx.MakeList(args...) } + +func (te *TransformEnv) bindMetadata() { + te.bind(sz.NameSymMeta, 0, listArgs) + te.bind(sz.NameSymTypeZettelmarkup, 2, func(args []sx.Object) sx.Object { + a := make(attrs.Attributes, 2). + Set("name", te.getSymbol(args[0]).String()). + Set("content", te.textEnc.Encode(te.getList(args[1]))) + return te.transformMeta(a) + }) + metaString := func(args []sx.Object) sx.Object { + a := make(attrs.Attributes, 2). + Set("name", te.getSymbol(args[0]).Name()). + Set("content", te.getString(args[1]).String()) + return te.transformMeta(a) + } + te.bind(sz.NameSymTypeCredential, 2, metaString) + te.bind(sz.NameSymTypeEmpty, 2, metaString) + te.bind(sz.NameSymTypeID, 2, metaString) + te.bind(sz.NameSymTypeNumber, 2, metaString) + te.bind(sz.NameSymTypeString, 2, metaString) + te.bind(sz.NameSymTypeTimestamp, 2, metaString) + te.bind(sz.NameSymTypeURL, 2, metaString) + te.bind(sz.NameSymTypeWord, 2, metaString) + metaSet := func(args []sx.Object) sx.Object { + var sb strings.Builder + for elem := te.getList(args[1]); elem != nil; elem = elem.Tail() { + sb.WriteByte(' ') + sb.WriteString(te.getString(elem.Car()).String()) } s := sb.String() if len(s) > 0 { s = s[1:] } a := make(attrs.Attributes, 2). - Set("name", te.getString(args).String()). + Set("name", te.getSymbol(args[0]).Name()). 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) + te.bind(sz.NameSymTypeIDSet, 2, metaSet) + te.bind(sz.NameSymTypeTagSet, 2, metaSet) + te.bind(sz.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(sz.NameSymBlock, 0, listArgs) + te.bind(sz.NameSymPara, 0, func(args []sx.Object) sx.Object { + // for ; args != nil; args = args.Tail() { + // lst, ok := sx.GetList(args.Car()) + // if !ok || lst != nil { + // break + // } + // } + return sx.MakeList(args...).Cons(te.symP) }) - te.bind(sexpr.NameSymHeading, 5, func(args *sxpf.List) sxpf.Object { - nLevel := te.getInt64(args) + te.bind(sz.NameSymHeading, 5, func(args []sx.Object) sx.Object { + nLevel := te.getInt64(args[0]) if nLevel <= 0 { te.err = fmt.Errorf("%v is a negative level", nLevel) - return sxpf.Nil() + return sx.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 := te.getAttributes(args[1]) + if fragment := te.getString(args[3]).String(); fragment != "" { a = a.Set("id", te.tr.unique+fragment) } - if result, ok := sxpf.GetList(argFragment.Tail().Car()); ok && result != nil { + if result, isPair := sx.GetPair(args[4]); isPair && 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("")) + return sx.MakeList(te.Make("h"+level), sx.String("")) }) - 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))) + te.bind(sz.NameSymThematic, 0, func(args []sx.Object) sx.Object { + result := sx.Nil() + if len(args) > 0 { + if attrList := te.getList(args[0]); attrList != nil { + result = result.Cons(te.transformAttribute(sz.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() + te.bind(sz.NameSymListOrdered, 0, te.makeListFn("ol")) + te.bind(sz.NameSymListUnordered, 0, te.makeListFn("ul")) + te.bind(sz.NameSymDescription, 0, func(args []sx.Object) sx.Object { + if len(args) == 0 { + return sx.Nil() } - items := sxpf.Nil().Cons(te.Make("dl")) + items := sx.Nil().Cons(te.Make("dl")) curItem := items - for elem := args; elem != nil; elem = elem.Tail() { - term := te.getList(elem) + for pos := 0; pos < len(args); pos++ { + term := te.getList(args[pos]) curItem = curItem.AppendBang(term.Cons(te.Make("dt"))) - elem = elem.Tail() - if elem == nil { + pos++ + if pos >= len(args) { break } - ddBlock := te.getList(elem) + ddBlock := te.getList(args[pos]) if ddBlock == nil { break } for ddlst := ddBlock; ddlst != nil; ddlst = ddlst.Tail() { - dditem := te.getList(ddlst) + dditem := te.getList(ddlst.Car()) curItem = curItem.AppendBang(dditem.Cons(te.Make("dd"))) } } return items }) - te.bind(sexpr.NameSymListQuote, 0, func(args *sxpf.List) sxpf.Object { + te.bind(sz.NameSymListQuote, 0, func(args []sx.Object) sx.Object { if args == nil { - return sxpf.Nil() + return sx.Nil() } - result := sxpf.Nil().Cons(te.Make("blockquote")) + result := sx.Nil().Cons(te.Make("blockquote")) currResult := result - for elem := args; elem != nil; elem = elem.Tail() { - if quote, ok := elem.Car().(*sxpf.List); ok { + for _, elem := range args { + if quote, isPair := sx.GetPair(elem); isPair { 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")) + te.bind(sz.NameSymTable, 1, func(args []sx.Object) sx.Object { + thead := sx.Nil() + if header := te.getList(args[0]); !sx.IsNil(header) { + thead = sx.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")) + tbody := sx.Nil() + if len(args) > 1 { + tbody = sx.Nil().Cons(te.Make("tbody")) curBody := tbody - for row := argBody; row != nil; row = row.Tail() { + for _, row := range args[1:] { curBody = curBody.AppendBang(te.transformTableRow(te.getList(row))) } } - table := sxpf.Nil() + table := sx.Nil() if tbody != nil { table = table.Cons(tbody) } if thead != nil { table = table.Cons(thead) } if table == nil { - return sxpf.Nil() + return sx.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)) + te.bind(sz.NameSymCell, 0, te.makeCellFn("")) + te.bind(sz.NameSymCellCenter, 0, te.makeCellFn("center")) + te.bind(sz.NameSymCellLeft, 0, te.makeCellFn("left")) + te.bind(sz.NameSymCellRight, 0, te.makeCellFn("right")) + + te.bind(sz.NameSymRegionBlock, 2, te.makeRegionFn(te.Make("div"), true)) + te.bind(sz.NameSymRegionQuote, 2, te.makeRegionFn(te.Make("blockquote"), false)) + te.bind(sz.NameSymRegionVerse, 2, te.makeRegionFn(te.Make("div"), false)) + + te.bind(sz.NameSymVerbatimComment, 1, func(args []sx.Object) sx.Object { + if te.getAttributes(args[0]).HasDefault() { + if len(args) > 1 { + if s := te.getString(args[1]); s != "" { + t := sx.String(s.String()) + return sx.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()) + te.bind(sz.NameSymVerbatimEval, 2, func(args []sx.Object) sx.Object { + return te.transformVerbatim(te.getAttributes(args[0]).AddClass("zs-eval"), te.getString(args[1])) + }) + te.bind(sz.NameSymVerbatimHTML, 2, te.transformHTML) + te.bind(sz.NameSymVerbatimMath, 2, func(args []sx.Object) sx.Object { + return te.transformVerbatim(te.getAttributes(args[0]).AddClass("zs-math"), te.getString(args[1])) + }) + te.bind(sz.NameSymVerbatimProg, 2, func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) + content := te.getString(args[1]) if a.HasDefault() { - content = sxpf.MakeString(visibleReplacer.Replace(content.String())) + content = sx.String(visibleReplacer.Replace(content.String())) } return te.transformVerbatim(a, content) }) - te.bind(sexpr.NameSymVerbatimZettel, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil() }) + te.bind(sz.NameSymVerbatimZettel, 0, func([]sx.Object) sx.Object { return sx.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(sz.NameSymBLOB, 3, func(args []sx.Object) sx.Object { + return te.transformBLOB(te.getList(args[0]), te.getString(args[1]), te.getString(args[2])) }) - te.bind(sexpr.NameSymTransclude, 2, func(args *sxpf.List) sxpf.Object { - ref, ok := args.Tail().Car().(*sxpf.List) - if !ok { - return sxpf.Nil() + te.bind(sz.NameSymTransclude, 2, func(args []sx.Object) sx.Object { + ref, isPair := sx.GetPair(args[1]) + if !isPair { + return sx.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( + if sx.IsNil(refKind) { + return sx.Nil() + } + if refValue := te.getString(ref.Tail().Car()); refValue != "" { + if te.astSF.MustMake(sz.NameSymRefStateExternal).IsEqual(refKind) { + a := te.getAttributes(args[0]).Set("src", refValue.String()).AddClass("external") + return sx.Nil().Cons(sx.Nil().Cons(te.transformAttribute(a)).Cons(te.Make("img"))).Cons(te.symP) + } + return sx.MakeList( te.Make(sxhtml.NameSymInlineComment), - sxpf.MakeString("transclude"), + sx.String("transclude"), refKind, - sxpf.MakeString("->"), + sx.String("->"), refValue, ) } - return args + return sx.MakeList(args...) }) } func (te *TransformEnv) makeListFn(tag string) transformFn { sym := te.Make(tag) - return func(args *sxpf.List) sxpf.Object { - result := sxpf.Nil().Cons(sym) + return func(args []sx.Object) sx.Object { + result := sx.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 { + for _, elem := range args { + item := sx.Nil().Cons(te.Make("li")) + if res, isPair := sx.GetPair(elem); isPair { 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() +func (te *TransformEnv) transformTableRow(pairs *sx.Pair) *sx.Pair { + row := sx.Nil().Cons(te.Make("tr")) + if pairs == nil { + return nil } curRow := row - for cell := cells; cell != nil; cell = cell.Tail() { - curRow = curRow.AppendBang(cell.Car()) + for pair := pairs; pair != nil; pair = pair.Tail() { + curRow = curRow.AppendBang(pair.Car()) } return row } func (te *TransformEnv) makeCellFn(align string) transformFn { - return func(args *sxpf.List) sxpf.Object { - tdata := args + return func(args []sx.Object) sx.Object { + tdata := sx.MakeList(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) +func (te *TransformEnv) makeRegionFn(sym *sx.Symbol, genericToClass bool) transformFn { + return func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) if genericToClass { if val, found := a.Get(""); found { a = a.Remove("").AddClass(val) } } - result := sxpf.Nil() + result := sx.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 := result.LastPair() + if region, isPair := sx.GetPair(args[1]); isPair { currResult = currResult.ExtendBang(region) } - if citeArg := blockArg.Tail(); citeArg != nil { - if cite, ok := citeArg.Car().(*sxpf.List); ok && cite != nil { + if len(args) > 2 { + if cite, isPair := sx.GetPair(args[2]); isPair && cite != nil { currResult.AppendBang(cite.Cons(te.Make("cite"))) } } return result } } -func (te *TransformEnv) transformVerbatim(a attrs.Attributes, s sxpf.String) sxpf.Object { +func (te *TransformEnv) transformVerbatim(a attrs.Attributes, s sx.String) sx.Object { a = setProgLang(a) - code := sxpf.Nil().Cons(s) + code := sx.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")) + return sx.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(" ") + te.bind(sz.NameSymInline, 0, listArgs) + te.bind(sz.NameSymText, 1, func(args []sx.Object) sx.Object { return te.getString(args[0]) }) + te.bind(sz.NameSymSpace, 0, func(args []sx.Object) sx.Object { + if len(args) == 0 { + return sx.String(" ") } - return te.getString(args) + return te.getString(args[0]) }) - te.bind(sexpr.NameSymSoft, 0, func(*sxpf.List) sxpf.Object { return sxpf.MakeString(" ") }) + te.bind(sz.NameSymSoft, 0, func([]sx.Object) sx.Object { return sx.String(" ") }) brSym := te.Make("br") - te.bind(sexpr.NameSymHard, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil().Cons(brSym) }) + te.bind(sz.NameSymHard, 0, func([]sx.Object) sx.Object { return sx.Nil().Cons(brSym) }) - te.bind(sexpr.NameSymLinkInvalid, 2, func(args *sxpf.List) sxpf.Object { + te.bind(sz.NameSymLinkInvalid, 2, func(args []sx.Object) sx.Object { // a := te.getAttributes(args) - refArg := args.Tail() - inline := refArg.Tail() + var inline *sx.Pair + if len(args) > 2 { + inline = sx.MakeList(args[2:]...) + } if inline == nil { - inline = sxpf.Nil().Cons(refArg.Car()) + inline = sx.Nil().Cons(args[1]) } 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()) + transformHREF := func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) + refValue := te.getString(args[1]) + return te.transformLink(a.Set("href", refValue.String()), refValue, args[2:]) + } + te.bind(sz.NameSymLinkZettel, 2, transformHREF) + te.bind(sz.NameSymLinkSelf, 2, transformHREF) + te.bind(sz.NameSymLinkFound, 2, transformHREF) + te.bind(sz.NameSymLinkBroken, 2, func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) + refValue := te.getString(args[1]) + return te.transformLink(a.AddClass("broken"), refValue, args[2:]) }) - 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()) + te.bind(sz.NameSymLinkHosted, 2, transformHREF) + te.bind(sz.NameSymLinkBased, 2, transformHREF) + te.bind(sz.NameSymLinkQuery, 2, func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) + refValue := te.getString(args[1]) query := "?" + api.QueryKeyQuery + "=" + url.QueryEscape(refValue.String()) - return te.transformLink(a.Set("href", query), refValue, args.Tail().Tail()) + return te.transformLink(a.Set("href", query), refValue, args[2:]) }) - 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(sz.NameSymLinkExternal, 2, func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) + refValue := te.getString(args[1]) + return te.transformLink(a.Set("href", refValue.String()).AddClass("external"), refValue, args[2:]) }) - te.bind(sexpr.NameSymEmbed, 3, func(args *sxpf.List) sxpf.Object { - argRef := args.Tail() - ref := te.getList(argRef) - syntax := te.getString(argRef.Tail()) + te.bind(sz.NameSymEmbed, 3, func(args []sx.Object) sx.Object { + ref := te.getList(args[1]) + syntax := te.getString(args[2]) 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( + embedAttr := sx.MakeList( + te.symAttr, + sx.Cons(te.Make("type"), sx.String("image/svg+xml")), + sx.Cons(te.Make("src"), sx.String("/"+te.getString(ref.Tail()).String()+".svg")), + ) + return sx.MakeList( + te.Make("figure"), + sx.MakeList( te.Make("embed"), embedAttr, ), ) } - a := te.getAttributes(args) - a = a.Set("src", string(te.getString(ref.Tail()))) + a := te.getAttributes(args[0]) + a = a.Set("src", string(te.getString(ref.Tail().Car()))) 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)) + return sx.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()) + te.bind(sz.NameSymEmbedBLOB, 3, func(args []sx.Object) sx.Object { + a, syntax, data := te.getAttributes(args[0]), te.getString(args[1]), te.getString(args[2]) summary, _ := a.Get(api.KeySummary) return te.transformBLOB( - sxpf.MakeList(te.astSF.MustMake(sexpr.NameSymInline), sxpf.MakeString(summary)), + sx.MakeList(te.astSF.MustMake(sz.NameSymInline), sx.String(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(", ")) + te.bind(sz.NameSymCite, 2, func(args []sx.Object) sx.Object { + result := sx.Nil() + if key := te.getString(args[1]); key != "" { + if len(args) > 2 { + result = sx.MakeList(args[2:]...).Cons(sx.String(", ")) } result = result.Cons(key) } - if a := te.getAttributes(args); len(a) > 0 { + if a := te.getAttributes(args[0]); 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() + te.bind(sz.NameSymMark, 3, func(args []sx.Object) sx.Object { + result := sx.MakeList(args[3:]...) if !te.tr.noLinks { - if fragment := te.getString(argFragment); fragment != "" { + if fragment := te.getString(args[2]); 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 { + te.bind(sz.NameSymEndnote, 1, func(args []sx.Object) sx.Object { + attrPlist := sx.Nil() + if a := te.getAttributes(args[0]); 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() + text, isPair := sx.GetPair(args[1]) + if !isPair { + return sx.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 { + hrefAttr := sx.Nil().Cons(sx.Cons(te.Make("role"), sx.String("doc-noteref"))). + Cons(sx.Cons(te.Make("href"), sx.String("#fn:"+noteID))). + Cons(sx.Cons(te.tr.symClass, sx.String("zs-noteref"))). + Cons(te.symAttr) + href := sx.Nil().Cons(sx.String(noteNum)).Cons(hrefAttr).Cons(te.symA) + supAttr := sx.Nil().Cons(sx.Cons(te.Make("id"), sx.String("fnref:"+noteID))).Cons(te.symAttr) + return sx.Nil().Cons(href).Cons(supAttr).Cons(te.Make("sup")) + }) + + te.bind(sz.NameSymFormatDelete, 1, te.makeFormatFn("del")) + te.bind(sz.NameSymFormatEmph, 1, te.makeFormatFn("em")) + te.bind(sz.NameSymFormatInsert, 1, te.makeFormatFn("ins")) + te.bind(sz.NameSymFormatQuote, 1, te.transformQuote) + te.bind(sz.NameSymFormatSpan, 1, te.makeFormatFn("span")) + te.bind(sz.NameSymFormatStrong, 1, te.makeFormatFn("strong")) + te.bind(sz.NameSymFormatSub, 1, te.makeFormatFn("sub")) + te.bind(sz.NameSymFormatSuper, 1, te.makeFormatFn("sup")) + + te.bind(sz.NameSymLiteralComment, 1, func(args []sx.Object) sx.Object { + if te.getAttributes(args[0]).HasDefault() { + if len(args) > 1 { + if s := te.getString(args[1]); s != "" { + return sx.Nil().Cons(s).Cons(te.Make(sxhtml.NameSymInlineComment)) + } + } + } + return sx.Nil() + }) + te.bind(sz.NameSymLiteralHTML, 2, te.transformHTML) + kbdSym := te.Make("kbd") + te.bind(sz.NameSymLiteralInput, 2, func(args []sx.Object) sx.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") + te.bind(sz.NameSymLiteralMath, 2, func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]).AddClass("zs-math") return te.transformLiteral(args, a, codeSym) }) sampSym := te.Make("samp") - te.bind(sexpr.NameSymLiteralOutput, 2, func(args *sxpf.List) sxpf.Object { + te.bind(sz.NameSymLiteralOutput, 2, func(args []sx.Object) sx.Object { return te.transformLiteral(args, nil, sampSym) }) - te.bind(sexpr.NameSymLiteralProg, 2, func(args *sxpf.List) sxpf.Object { + te.bind(sz.NameSymLiteralProg, 2, func(args []sx.Object) sx.Object { return te.transformLiteral(args, nil, codeSym) }) - te.bind(sexpr.NameSymLiteralZettel, 0, func(*sxpf.List) sxpf.Object { return sxpf.Nil() }) + te.bind(sz.NameSymLiteralZettel, 0, func([]sx.Object) sx.Object { return sx.Nil() }) } func (te *TransformEnv) makeFormatFn(tag string) transformFn { sym := te.Make(tag) - return func(args *sxpf.List) sxpf.Object { - a := te.getAttributes(args) + return func(args []sx.Object) sx.Object { + a := te.getAttributes(args[0]) if val, found := a.Get(""); found { a = a.Remove("").AddClass(val) } - res := args.Tail() + res := sx.MakeList(args[1:]...) if len(a) > 0 { res = res.Cons(te.transformAttribute(a)) } return res.Cons(sym) } } -func (te *TransformEnv) transformQuote(args *sxpf.List) sxpf.Object { +func (te *TransformEnv) transformQuote(args []sx.Object) sx.Object { const langAttr = "lang" - a := te.getAttributes(args) + a := te.getAttributes(args[0]) 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() + res := sx.MakeList(args[1:]...) 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) + res = sx.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 { +func (te *TransformEnv) transformLiteral(args []sx.Object, a attrs.Attributes, sym *sx.Symbol) sx.Object { if a == nil { - a = te.getAttributes(args) + a = te.getAttributes(args[0]) } a = setProgLang(a) - literal := te.getString(args.Tail()).String() + literal := te.getString(args[1]).String() if a.HasDefault() { a = a.RemoveDefault() literal = visibleReplacer.Replace(literal) } - res := sxpf.Nil().Cons(sxpf.MakeString(literal)) + res := sx.Nil().Cons(sx.String(literal)) if len(a) > 0 { res = res.Cons(te.transformAttribute(a)) } return res.Cons(sym) } @@ -755,129 +750,136 @@ 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) +func (te *TransformEnv) transformHTML(args []sx.Object) sx.Object { + if s := te.getString(args[1]); s != "" && IsSafe(s.String()) { + return sx.Nil().Cons(s).Cons(te.symNoEscape) } return nil } -func (te *TransformEnv) transformBLOB(description *sxpf.List, syntax, data sxpf.String) sxpf.Object { +func (te *TransformEnv) transformBLOB(description *sx.Pair, syntax, data sx.String) sx.Object { if data == "" { - return sxpf.Nil() + return sx.Nil() } switch syntax { case "": - return sxpf.Nil() + return sx.Nil() case api.ValueSyntaxSVG: - return sxpf.Nil().Cons(sxpf.Nil().Cons(data).Cons(te.symNoEscape)).Cons(te.symP) + return sx.Nil().Cons(sx.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()))) + imgAttr := sx.Nil().Cons(sx.Cons(te.Make("src"), sx.String("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))) + imgAttr = imgAttr.Cons(sx.Cons(te.Make("alt"), sx.String(d))) } - return sxpf.Nil().Cons(sxpf.Nil().Cons(imgAttr.Cons(te.symAttr)).Cons(te.Make("img"))).Cons(te.symP) + return sx.Nil().Cons(sx.Nil().Cons(imgAttr.Cons(te.symAttr)).Cons(te.Make("img"))).Cons(te.symP) } } -func (te *TransformEnv) flattenText(sb *strings.Builder, lst *sxpf.List) { +func (te *TransformEnv) flattenText(sb *strings.Builder, lst *sx.Pair) { for elem := lst; elem != nil; elem = elem.Tail() { switch obj := elem.Car().(type) { - case sxpf.String: + case sx.String: sb.WriteString(obj.String()) - case *sxpf.List: + case *sx.Pair: te.flattenText(sb, obj) } } } -type transformFn func(*sxpf.List) sxpf.Object +type transformFn func([]sx.Object) sx.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) + te.astEnv.Bind(te.astSF.MustMake(name), sxeval.BuiltinA(func(args []sx.Object) (sx.Object, error) { + if nArgs := len(args); nArgs < minArity { + return sx.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) { +func (te *TransformEnv) Rebind(name string, fn func([]sx.Object, sxeval.Callable) sx.Object) { sym := te.astSF.MustMake(name) obj, found := te.astEnv.Lookup(sym) if !found { panic(sym.String()) } - preFn, ok := obj.(sxpf.Callable) + preFn, ok := sxeval.GetCallable(obj) 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) + te.astEnv.Bind(sym, sxeval.BuiltinA(func(args []sx.Object) (sx.Object, error) { + res := fn(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 { +func (te *TransformEnv) Make(name string) *sx.Symbol { return te.tr.Make(name) } +func (te *TransformEnv) getSymbol(val sx.Object) *sx.Symbol { + if te.err != nil { + return nil + } + if sym, ok := sx.GetSymbol(val); ok { + return sym + } + te.err = fmt.Errorf("%v/%T is not a symbol", val, val) + return nil +} +func (te *TransformEnv) getString(val sx.Object) sx.String { if te.err != nil { return "" } - val := lst.Car() - if s, ok := val.(sxpf.String); ok { + if s, ok := sx.GetString(val); ok { return s } te.err = fmt.Errorf("%v/%T is not a string", val, val) return "" } -func (te *TransformEnv) getInt64(lst *sxpf.List) int64 { +func (te *TransformEnv) getInt64(val sx.Object) int64 { if te.err != nil { return -1017 } - val := lst.Car() - if num, ok := val.(*sxpf.Number); ok { - return num.GetInt64() + if num, ok := sx.GetNumber(val); ok { + return int64(num.(sx.Int64)) } te.err = fmt.Errorf("%v/%T is not a number", val, val) return -1017 } -func (te *TransformEnv) getList(lst *sxpf.List) *sxpf.List { +func (te *TransformEnv) getList(val sx.Object) *sx.Pair { if te.err == nil { - val := lst.Car() - if res, ok := val.(*sxpf.List); ok { + if res, isPair := sx.GetPair(val); isPair { return res } te.err = fmt.Errorf("%v/%T is not a list", val, val) } - return sxpf.Nil() + return nil } -func (te *TransformEnv) getAttributes(args *sxpf.List) attrs.Attributes { - return sexpr.GetAttributes(te.getList(args)) +func (te *TransformEnv) getAttributes(args sx.Object) attrs.Attributes { + return sz.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) +func (te *TransformEnv) transformLink(a attrs.Attributes, refValue sx.String, inline []sx.Object) sx.Object { + result := sx.MakeList(inline...) + if len(inline) == 0 { + result = sx.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 { +func (te *TransformEnv) transformAttribute(a attrs.Attributes) *sx.Pair { return te.tr.TransformAttrbute(a) } -func (te *TransformEnv) transformMeta(a attrs.Attributes) *sxpf.List { +func (te *TransformEnv) transformMeta(a attrs.Attributes) *sx.Pair { return te.tr.TransformMeta(a) } var unsafeSnippets = []string{ " 0 { + return result + } + return nil +} +func doMakeMeta(obj sx.Object) Meta { + result := make(map[string]MetaValue) + for { + if sx.IsNil(obj) { + return result + } + pair, isPair := sx.GetPair(obj) + if !isPair { + return result + } + if mv, ok2 := makeMetaValue(pair); ok2 { + result[mv.Key] = mv + } + obj = pair.Cdr() + } +} +func makeMetaValue(mnode *sx.Pair) (MetaValue, bool) { + var result MetaValue + mval, isPair := sx.GetPair(mnode.Car()) + if !isPair { + return result, false + } + typeSym, isSymbol := sx.GetSymbol(mval.Car()) + if !isSymbol { + return result, false + } + keyPair, isPair := sx.GetPair(mval.Cdr()) + if !isPair { + return result, false + } + keyList, isPair := sx.GetPair(keyPair.Car()) + if !isPair { + return result, false + } + quoteSym, isSymbol := sx.GetSymbol(keyList.Car()) + if !isSymbol || quoteSym.Name() != "quote" { + return result, false + } + keySym, isSymbol := sx.GetSymbol(keyList.Tail().Car()) + if !isSymbol { + return result, false + } + valPair, isPair := sx.GetPair(keyPair.Cdr()) + if !isPair { + return result, false + } + result.Type = typeSym.Name() + result.Key = keySym.Name() + 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) GetPair(key string) *sx.Pair { + if mv, found := m[key]; found { + if pair, isPair := sx.GetPair(mv.Value); isPair { + return pair + } + } + return nil +} Index: text/text.go ================================================================== --- text/text.go +++ text/text.go @@ -12,77 +12,77 @@ package text import ( "strings" - "codeberg.org/t73fde/sxpf" - "zettelstore.de/c/sexpr" + "zettelstore.de/client.fossil/sz" + "zettelstore.de/sx.fossil" ) // Encoder is the structure to hold relevant data to execute the encoding. type Encoder struct { - sf sxpf.SymbolFactory + sf sx.SymbolFactory sb strings.Builder - symText *sxpf.Symbol - symSpace *sxpf.Symbol - symSoft *sxpf.Symbol - symHard *sxpf.Symbol - symQuote *sxpf.Symbol + symText *sx.Symbol + symSpace *sx.Symbol + symSoft *sx.Symbol + symHard *sx.Symbol + symQuote *sx.Symbol } -func NewEncoder(sf sxpf.SymbolFactory) *Encoder { +func NewEncoder(sf sx.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), + symText: sf.MustMake(sz.NameSymText), + symSpace: sf.MustMake(sz.NameSymSpace), + symSoft: sf.MustMake(sz.NameSymSoft), + symHard: sf.MustMake(sz.NameSymHard), + symQuote: sf.MustMake(sz.NameSymQuote), } return enc } -func (enc *Encoder) Encode(lst *sxpf.List) string { +func (enc *Encoder) Encode(lst *sx.Pair) 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 { +func EvaluateInlineString(lst *sx.Pair) string { + if sf := sx.FindSymbolFactory(lst); sf != nil { return NewEncoder(sf).Encode(lst) } return "" } -func (enc *Encoder) executeList(lst *sxpf.List) { +func (enc *Encoder) executeList(lst *sx.Pair) { 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 { +func (enc *Encoder) execute(obj sx.Object) { + cmd, isPair := sx.GetPair(obj) + if !isPair { return } sym := cmd.Car() - if sxpf.IsNil(sym) { + if sx.IsNil(sym) { return } if sym.IsEqual(enc.symText) { args := cmd.Tail() if args == nil { return } - if val, ok2 := args.Car().(sxpf.String); ok2 { + if val, isString := sx.GetString(args.Car()); isString { enc.sb.WriteString(val.String()) } } else if sym.IsEqual(enc.symSpace) || sym.IsEqual(enc.symSoft) { enc.sb.WriteByte(' ') } else if sym.IsEqual(enc.symHard) { Index: text/text_test.go ================================================================== --- text/text_test.go +++ text/text_test.go @@ -12,35 +12,35 @@ import ( "strings" "testing" - "codeberg.org/t73fde/sxpf" - "codeberg.org/t73fde/sxpf/reader" - "zettelstore.de/c/text" + "zettelstore.de/client.fossil/text" + "zettelstore.de/sx.fossil" + "zettelstore.de/sx.fossil/sxreader" ) -func TestSexprText(t *testing.T) { +func TestSzText(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() + sval, err := sxreader.MakeReader(strings.NewReader(tc.src)).Read() if err != nil { t.Error(err) continue } - seq, ok := sval.(*sxpf.List) - if !ok { + seq, isPair := sx.GetPair(sval) + if !isPair { 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) } } } Index: www/changes.wiki ================================================================== --- www/changes.wiki +++ www/changes.wiki @@ -1,9 +1,15 @@ Change Log + +

Changes for Version 0.13.0 (pending)

+ * API uses plain data or sx data, but no JSON encoded data. + * Dependency sx is now hosted on Fossil repository, same for this library. + -

Changes for Version 0.12.0 (pending)

+

Changes for Version 0.12.0 (2023-06-05)

+ * Rename "sexpr" to "sz".

Changes for Version 0.11.0 (2023-03-27)

* Remove all zjson related declarations. * Generate HTML via SxHTML, not manually and direct. Index: www/index.wiki ================================================================== --- www/index.wiki +++ www/index.wiki @@ -1,12 +1,12 @@ Home This repository contains Go client software to access [https://zettelstore.de|Zettelstore] via its API. -

Latest Release: 0.11.0 (2023-03-27)

- * [./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] +

Latest Release: 0.13.0 (2023-08-07)

+ * [./changes.wiki#0_13|Change summary] + * [/timeline?p=v0.13.0&bt=v0.20.0&y=ci|Check-ins for version 0.13.0], + [/vdiff?to=v0.13.0&from=v0.20.0|content diff] + * [/timeline?df=v0.13.0&y=ci|Check-ins derived from the 0.13.0 release], + [/vdiff?from=v0.13.0&to=trunk|content diff] * [/timeline?t=release|Timeline of all past releases]