patch of lexicons: rework lexicons to add submodule support · round #0 · pull #787 · tangled.org/core

+13 -1

api/tangled/repoblob.go

···

       30
        
       // RepoBlob_Output is the output of a sh.tangled.repo.blob call.

     

       31
        
       type RepoBlob_Output struct {

     

       32
        
       	// content: File content (base64 encoded for binary files)

     

       33
       -
       	Content string `json:"content" cborgen:"content"`

     

       34
        
       	// encoding: Content encoding

     

       35
        
       	Encoding *string `json:"encoding,omitempty" cborgen:"encoding,omitempty"`

     

       36
        
       	// isBinary: Whether the file is binary

     
···

       44
        
       	Ref string `json:"ref" cborgen:"ref"`

     

       45
        
       	// size: File size in bytes

     

       46
        
       	Size *int64 `json:"size,omitempty" cborgen:"size,omitempty"`

     

       0
        
       
     

       0
        
       
     

       47
        
       }

     

       48
        
       

     

       49
        
       // RepoBlob_Signature is a "signature" in the sh.tangled.repo.blob schema.

     
···

       56
        
       	When string `json:"when" cborgen:"when"`

     

       57
        
       }

     

       58
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
       // RepoBlob calls the XRPC method "sh.tangled.repo.blob".

     

       60
        
       //

     

       61
        
       // path: Path to the file within the repository

···

       30
        
       // RepoBlob_Output is the output of a sh.tangled.repo.blob call.

     

       31
        
       type RepoBlob_Output struct {

     

       32
        
       	// content: File content (base64 encoded for binary files)

     

       33
       +
       	Content *string `json:"content,omitempty" cborgen:"content,omitempty"`

     

       34
        
       	// encoding: Content encoding

     

       35
        
       	Encoding *string `json:"encoding,omitempty" cborgen:"encoding,omitempty"`

     

       36
        
       	// isBinary: Whether the file is binary

     
···

       44
        
       	Ref string `json:"ref" cborgen:"ref"`

     

       45
        
       	// size: File size in bytes

     

       46
        
       	Size *int64 `json:"size,omitempty" cborgen:"size,omitempty"`

     

       47
       +
       	// submodule: Submodule information if path is a submodule

     

       48
       +
       	Submodule *RepoBlob_Submodule `json:"submodule,omitempty" cborgen:"submodule,omitempty"`

     

       49
        
       }

     

       50
        
       

     

       51
        
       // RepoBlob_Signature is a "signature" in the sh.tangled.repo.blob schema.

     
···

       58
        
       	When string `json:"when" cborgen:"when"`

     

       59
        
       }

     

       60
        
       

     

       61
       +
       // RepoBlob_Submodule is a "submodule" in the sh.tangled.repo.blob schema.

     

       62
       +
       type RepoBlob_Submodule struct {

     

       63
       +
       	// branch: Branch to track in the submodule

     

       64
       +
       	Branch *string `json:"branch,omitempty" cborgen:"branch,omitempty"`

     

       65
       +
       	// name: Submodule name

     

       66
       +
       	Name string `json:"name" cborgen:"name"`

     

       67
       +
       	// url: Submodule repository URL

     

       68
       +
       	Url string `json:"url" cborgen:"url"`

     

       69
       +
       }

     

       70
       +
       

     

       71
        
       // RepoBlob calls the XRPC method "sh.tangled.repo.blob".

     

       72
        
       //

     

       73
        
       // path: Path to the file within the repository

-4

api/tangled/repotree.go

···

       47
        
       

     

       48
        
       // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

     

       49
        
       type RepoTree_TreeEntry struct {

     

       50
       -
       	// is_file: Whether this entry is a file

     

       51
       -
       	Is_file bool `json:"is_file" cborgen:"is_file"`

     

       52
       -
       	// is_subtree: Whether this entry is a directory/subtree

     

       53
       -
       	Is_subtree  bool                 `json:"is_subtree" cborgen:"is_subtree"`

     

       54
        
       	Last_commit *RepoTree_LastCommit `json:"last_commit,omitempty" cborgen:"last_commit,omitempty"`

     

       55
        
       	// mode: File mode

     

       56
        
       	Mode string `json:"mode" cborgen:"mode"`

···

       47
        
       

     

       48
        
       // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

     

       49
        
       type RepoTree_TreeEntry struct {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       	Last_commit *RepoTree_LastCommit `json:"last_commit,omitempty" cborgen:"last_commit,omitempty"`

     

       51
        
       	// mode: File mode

     

       52
        
       	Mode string `json:"mode" cborgen:"mode"`

+49 -5

lexicons/repo/blob.json

···

       6
        
             "type": "query",

     

       7
        
             "parameters": {

     

       8
        
               "type": "params",

     

       9
       -
               "required": ["repo", "ref", "path"],

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
               "properties": {

     

       11
        
                 "repo": {

     

       12
        
                   "type": "string",

     
···

       31
        
               "encoding": "application/json",

     

       32
        
               "schema": {

     

       33
        
                 "type": "object",

     

       34
       -
                 "required": ["ref", "path", "content"],

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
                 "properties": {

     

       36
        
                   "ref": {

     

       37
        
                     "type": "string",

     
···

       48
        
                   "encoding": {

     

       49
        
                     "type": "string",

     

       50
        
                     "description": "Content encoding",

     

       51
       -
                     "enum": ["utf-8", "base64"]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       52
        
                   },

     

       53
        
                   "size": {

     

       54
        
                     "type": "integer",

     
···

       62
        
                     "type": "string",

     

       63
        
                     "description": "MIME type of the file"

     

       64
        
                   },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       65
        
                   "lastCommit": {

     

       66
        
                     "type": "ref",

     

       67
        
                     "ref": "#lastCommit"

     
···

       90
        
           },

     

       91
        
           "lastCommit": {

     

       92
        
             "type": "object",

     

       93
       -
             "required": ["hash", "message", "when"],

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       94
        
             "properties": {

     

       95
        
               "hash": {

     

       96
        
                 "type": "string",

     
···

       117
        
           },

     

       118
        
           "signature": {

     

       119
        
             "type": "object",

     

       120
       -
             "required": ["name", "email", "when"],

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       121
        
             "properties": {

     

       122
        
               "name": {

     

       123
        
                 "type": "string",

     
···

       133
        
                 "description": "Author timestamp"

     

       134
        
               }

     

       135
        
             }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       136
        
           }

     

       137
        
         }

     

       138
        
       }

···

       6
        
             "type": "query",

     

       7
        
             "parameters": {

     

       8
        
               "type": "params",

     

       9
       +
               "required": [

     

       10
       +
                 "repo",

     

       11
       +
                 "ref",

     

       12
       +
                 "path"

     

       13
       +
               ],

     

       14
        
               "properties": {

     

       15
        
                 "repo": {

     

       16
        
                   "type": "string",

     
···

       35
        
               "encoding": "application/json",

     

       36
        
               "schema": {

     

       37
        
                 "type": "object",

     

       38
       +
                 "required": [

     

       39
       +
                   "ref",

     

       40
       +
                   "path"

     

       41
       +
                 ],

     

       42
        
                 "properties": {

     

       43
        
                   "ref": {

     

       44
        
                     "type": "string",

     
···

       55
        
                   "encoding": {

     

       56
        
                     "type": "string",

     

       57
        
                     "description": "Content encoding",

     

       58
       +
                     "enum": [

     

       59
       +
                       "utf-8",

     

       60
       +
                       "base64"

     

       61
       +
                     ]

     

       62
        
                   },

     

       63
        
                   "size": {

     

       64
        
                     "type": "integer",

     
···

       72
        
                     "type": "string",

     

       73
        
                     "description": "MIME type of the file"

     

       74
        
                   },

     

       75
       +
                   "submodule": {

     

       76
       +
                     "type": "ref",

     

       77
       +
                     "ref": "#submodule",

     

       78
       +
                     "description": "Submodule information if path is a submodule"

     

       79
       +
                   },

     

       80
        
                   "lastCommit": {

     

       81
        
                     "type": "ref",

     

       82
        
                     "ref": "#lastCommit"

     
···

       105
        
           },

     

       106
        
           "lastCommit": {

     

       107
        
             "type": "object",

     

       108
       +
             "required": [

     

       109
       +
               "hash",

     

       110
       +
               "message",

     

       111
       +
               "when"

     

       112
       +
             ],

     

       113
        
             "properties": {

     

       114
        
               "hash": {

     

       115
        
                 "type": "string",

     
···

       136
        
           },

     

       137
        
           "signature": {

     

       138
        
             "type": "object",

     

       139
       +
             "required": [

     

       140
       +
               "name",

     

       141
       +
               "email",

     

       142
       +
               "when"

     

       143
       +
             ],

     

       144
        
             "properties": {

     

       145
        
               "name": {

     

       146
        
                 "type": "string",

     
···

       156
        
                 "description": "Author timestamp"

     

       157
        
               }

     

       158
        
             }

     

       159
       +
           },

     

       160
       +
           "submodule": {

     

       161
       +
             "type": "object",

     

       162
       +
             "required": [

     

       163
       +
               "name",

     

       164
       +
               "url"

     

       165
       +
             ],

     

       166
       +
             "properties": {

     

       167
       +
               "name": {

     

       168
       +
                 "type": "string",

     

       169
       +
                 "description": "Submodule name"

     

       170
       +
               },

     

       171
       +
               "url": {

     

       172
       +
                 "type": "string",

     

       173
       +
                 "description": "Submodule repository URL"

     

       174
       +
               },

     

       175
       +
               "branch": {

     

       176
       +
                 "type": "string",

     

       177
       +
                 "description": "Branch to track in the submodule"

     

       178
       +
               }

     

       179
       +
             }

     

       180
        
           }

     

       181
        
         }

     

       182
        
       }

+1 -9

lexicons/repo/tree.json

···

       91
        
           },

     

       92
        
           "treeEntry": {

     

       93
        
             "type": "object",

     

       94
       -
             "required": ["name", "mode", "size", "is_file", "is_subtree"],

     

       95
        
             "properties": {

     

       96
        
               "name": {

     

       97
        
                 "type": "string",

     
···

       105
        
                 "type": "integer",

     

       106
        
                 "description": "File size in bytes"

     

       107
        
               },

     

       108
       -
               "is_file": {

     

       109
       -
                 "type": "boolean",

     

       110
       -
                 "description": "Whether this entry is a file"

     

       111
       -
               },

     

       112
       -
               "is_subtree": {

     

       113
       -
                 "type": "boolean",

     

       114
       -
                 "description": "Whether this entry is a directory/subtree"

     

       115
       -
               },

     

       116
        
               "last_commit": {

     

       117
        
                 "type": "ref",

     

       118
        
                 "ref": "#lastCommit"

···

       91
        
           },

     

       92
        
           "treeEntry": {

     

       93
        
             "type": "object",

     

       94
       +
             "required": ["name", "mode", "size"],

     

       95
        
             "properties": {

     

       96
        
               "name": {

     

       97
        
                 "type": "string",

     
···

       105
        
                 "type": "integer",

     

       106
        
                 "description": "File size in bytes"

     

       107
        
               },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       108
        
               "last_commit": {

     

       109
        
                 "type": "ref",

     

       110
        
                 "ref": "#lastCommit"