Skip to content

Commit

Permalink
WIP: UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@ilyash-b
ilyash-b committed Feb 24, 2024
1 parent 3f0b71b commit 99b8bd6
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 169 deletions.
208 changes: 100 additions & 108 deletions lib/autoload/globals/ui.ngs
View file
Original file line number Diff line number Diff line change
@@ -1,129 +1,121 @@
ns {
# WIP
# Warning: low quality, hacky code

global id
doc Warning! Not sure about correctness!
F id(t:Type) {
m = t.meta()
has_ns = m =~ {'ns': Namespace}
not(has_ns) returns "ngs:type:${t.name}"
if m.ns.meta().has(JsonData) {
# Maybe :: separator here is not a good idea
return "ngs:type:${m.ns.meta()[JsonData].ns}::${t.name}"
}
throw NotImplemented("id() for types in namespaces (without .meta()[JsonData].ns} is not implemented yet").set('type', t)
global init, JsonData

# TODO:
# * Recreate previous version but cleanly
# * Move transformation to table from shell.ngs to this file
# * Add row/object-fields semantics
# * Consider add nested context to render()
# * UI action should have
# * Reference to the original command and the output
# * ID of the object
# * Action name

type Element()

type Screen(Element)
type Object(Element)

type Scalar(Element)
type Table(Element)
type Columns(Element)
type Column(Element)
type Rows(Element)
type Row(Element)
type Properties(Element)
type List(Element)
type ProcessStatus(Element)
type Progress(Element)

F raw(h:Hash) h + {'$type': '$raw'}

F init(e:Element, children:Arr) {
# assert(children, Repeat(Element))
children.each({ assert(A, Element, "All children of Element must be of type Element") })
# echo("init(${e.Type().name}, Arr)")
init(args())
}

doc To Do: better naming
type InteractiveObject

doc Can't use JsonData for anything in this namespace, it clashes with the multimethod
F id(t:Type) {
guard t === InteractiveObject
'ngs:type:ui::InteractiveObject'
# TODO: serialization design
F JsonData(e:Element) {
# Note: all Element subtypes need to reside in this namespace
# if they don't, there could be name collisions
{'$type': e.Type().name} + e.Hash().JsonData()
}

F _json_data_fields(x, fields:Arr) {
{
'type': id(x.Type())
'fields': fields.Hash({ JsonData(x.(A)) })
}
}
F init(s:Scalar, value) init(args())
F init(c:Column, name:Str) init(args())
F init(p:Properties, props:Hash) init(args())
F init(p:ProcessStatus, name:Str, text:Str) init(args()) # TODO: improve + add semantics
F init(p:Progress, step:Int, total_steps:Int) init(args())

F _json_data_fields(x) {
{
'type': id(x.Type())
'fields': x.Hash().mapv(JsonData)
}
}

F JsonData(x) throw NotImplemented("JsonData() for type ${x.Type()} is not implemented yet").set(val=x)
F Element(x:AnyOf(Num, Str, Bool, Null)) Scalar(x)
F Element(a:AnyOf(Arr, ArrLike)) List(a.map(Element))

section "JsonData - scalars" {
F JsonData(x:AnyOf(Num, Str, Bool, Null)) {
{ 'type': id(x.Type()), 'value': x }
}
F JsonData(p:Path) { 'type': id(p.Type()), 'value': p.path }
}
# TODO: improve heuristics of detection when to render to table
F Element(a:Arr) {
guard a
guard all(a, Hash)
t = Table2::Table(a)

section "JsonData - lists" {
F JsonData(a:AnyOf(Arr, ArrLike)) {
{ 'type': id(a.Type()), 'items': a.map(JsonData) }
}
Table().set(
columns = t.cols_enum.keys().map(Column).Columns()
rows = t.rows.map(F(row) {
Row(row.map(Element)) # map each cell
}).Rows()
)
}

section "JsonData - maps" {
F JsonData(h:AnyOf(Hash, HashLike)) {
{
'type': id(h.Type())
'items': h.map(F(k, v) [k.JsonData(), v.JsonData()])
}
}
}

section "JsonData - table" {
Table2.meta()[JsonData] = {'ns': 'Table2'}
F JsonData(t:Table2::Table) {
{
'type': id(t.Type())
'name': t.name.JsonData()
'columns_names': t.cols_enum.keys().JsonData()
'rows': t.rows.JsonData()
}
F keys_are_strings(h) h.keys().all(Str)
F Element(h:AnyOf(Hash, HashLike)) Properties(h.assert(keys_are_strings, "Element(Hash) - keys must be strings").mapv(Element))


# TODO: Fix later. It's semantically incorrect to display path as just a string
F Element(p:Path) Scalar(p.path)

section "ProcessesPipeline" {
# TODO: Use AbstractProcess
F Element(pp:ProcessesPipeline) {
processes = pp.processes
guard processes
p = processes[-1]
{ p.stdout.decode({'process': p}) }.Result().dflt({
error("In shell.ngs, trying to decode:")
print_exception(A.val)
# throw InvalidArgument("Element() could not decode process output").set(process=p)
p.stdout # TODO: maybe split into lines
}).get().Element()
}
}

F JsonData(c:Command) c._json_data_fields(%[argv])

F JsonData(p:Process) p._json_data_fields(%[command executable pid exit_code exit_signal stdout stderr])

F JsonData(f:Fun) f.Str().JsonData()

doc Incorrect, should pass the whole pipeline
F JsonData(p:ProcessesPipeline) p.processes[-1].JsonData()
F JsonData(p:ProcessesPipeline) {
guard p.processes.len() > 1
throw NotImplemented()
}

F JsonData(rd:ResDef) {
warn("Unexpected use of JsonData(ResDef)")
resources = rd.find().resources
Table2::Table(resources.props).JsonData()
}
F JsonData(r:Res) r.Hash().without('def').JsonData().set(type=id(r.Type()))
section "AWS" {
# TODO: Move whatever possible from CodePipeline.ngs to AbstractProcess.ngs
_cp = require("aws/CodePipeline.ngs")

F JsonData(ps:AbstractProcess::Status::Status) ps._json_data_fields(%[text])
F Element(s:AbstractProcess::Status::Status) ProcessStatus(s.Type().name, s.text)

section "InteractiveObject" {
# TODO: Send context so that interaction could be seen as part of the bigger picture
F JsonData(i:InteractiveObject) i._json_data_fields(%[type id text default_action])
}
# TODO: .total_steps might not be known
F Element(p:_cp::Progress) Progress(p.step, p.total_steps)

section "AWS2" {
# TODO: generalize
AWS2.meta()[JsonData] = {'ns': 'AWS2'}
}
# WIP
F Element(cp:_cp::Pipeline) {
Object([Element(Str(cp))])::{
A.('$id') = raw({
"type": "AWS::CodePipeline::Pipeline"
"id": cp.name
"blah-str": "s123"
"blah-num": 123
})
}
}

section "Process Status" {
AbstractProcess::Status.meta()[JsonData] = {'ns': 'ProcessStatus'}
# Later
F Element(r:_cp::Revision) Element(Str(r))
F Element(s:_cp::Source) Element(Str(s))
F Element(a:_cp::Action) Element(Str(a))
}

section "aws/*.ngs" {
_cp = require("aws/CodePipeline.ngs")
# TODO: factor out
_cp.meta()[JsonData] = {'ns': 'CodePipeline'}

F JsonData(saf:_cp::SendAllFields) saf._json_data_fields()

F JsonData(p:_cp::Pipeline) {
ui::InteractiveObject().set(
type = 'AWS::CodePipeline::Pipeline'
id = p.name
text = p.name
default_action = 'View CodePipeline'
).JsonData()
}
}
# ngs -ppj 'require("aws/CodePipeline.ngs")::pipelines::list().(ui::Element)'
# ngs -ppj '$(ls).(ui::Element)'
}
67 changes: 6 additions & 61 deletions lib/shell.ngs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,58 +26,22 @@ F on_listen(sh:ServerHandler, s:Server) {
# TODO: open the web app
}

{ ui }

net::unix_json_rpc_server("ngs-shell.sock", ns {

F eval(line:Str) {

F transform(x) x

F transform(a:Arr) {
guard a
guard all(a, Hash)
Table2::Table(a)
}

# TODO: find better place for this
# Based on: F ````(cp:CommandsPipeline)
F transform(pp:ProcessesPipeline) {
processes = pp.processes
guard processes
p = processes[-1]
r = Result({ p.stdout.decode({'process': p}) })
if r is Failure {
error("In shell.ngs, trying to decode:")
print_exception(r.val)
}
guard r
decoded = r.get()
if p =~ %(aws codepipeline list-pipelines) {
for pipeline in decoded {
pipeline.name = ui::InteractiveObject().set(
type = 'AWS::CodePipeline::Pipeline'
id = pipeline.name
text = pipeline.name
default_action = 'View CodePipeline'
)
}
}
decoded.transform()
}


fname = '<shell line file>'

section "Frequent testing assist" {
_assist = {
section "Shortcuts" {
shortcuts = {
'v': 'aws ec2 describe-vpcs'
'p-': 'aws codepipeline list-pipelines'
'p': '{ require("aws/CodePipeline.ngs")::pipelines::list() }'
'p_censored': '{ require("aws/CodePipeline.ngs")::pipelines::list().map(F(p) p.filterk(Not(AnyOf(%[sources revisions])))) }'
's-': 'aws cloudformation list-stacks'
's': 'saws::stacks()'
}
line = _assist.get(line, line)
line = shortcuts.get(line, line)
}
bytecode = compile(line, fname)
# TODO: pass warnings
Expand All @@ -89,9 +53,9 @@ net::unix_json_rpc_server("ngs-shell.sock", ns {
func = load(bytecode, "<shell line func>")
result = func()
log("Result type ${result.Type().name}")
result .= transform()
result = ui::Element(result)
log("Result type after transform() ${result.Type().name}")
result = ui::JsonData(result)
result.JsonData()
}

section "tests" {
Expand All @@ -108,23 +72,4 @@ net::unix_json_rpc_server("ngs-shell.sock", ns {
1 / 0
}
}

doc TODO - plugins fan-out / plugins register to serve
F ui_default_action(type, id) {
debug("ui_default_action on object ${type} ${id} was not handled")
}

doc Unusable output
F ui_default_action(type, id) {
guard type == 'AWS::CodePipeline::Pipeline'
log('ui_default_action for AWS::CodePipeline::Pipeline')
# TODO: escape_bash() version of the command too
# TODO: deduplicate the command
ui::JsonData({
'type': 'timeline_new_command'
'command': %[aws codepipeline get-pipeline --name $id]
'output': ``aws codepipeline get-pipeline --name $id``
})
}

})

0 comments on commit 99b8bd6

Please sign in to comment.