From 12ec9e39e39b881b3300ab84a29114d443c55024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yanis=20Zafir=C3=B3pulos?= <1265028+drkameleon@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:42:09 +0200 Subject: [PATCH 1/4] disable debugging --- grafito.art | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafito.art b/grafito.art index 6d2b73bc9..61c278552 100755 --- a/grafito.art +++ b/grafito.art @@ -25,7 +25,7 @@ Grafito: #[ Version: 0.2.8 ; configuration - Debug?: true + Debug?: false verbose?: true caseSensitive?: true From 322e3af06f53d2514d176f28395487c134b98fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yanis=20Zafir=C3=B3pulos?= <1265028+drkameleon@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:44:58 +0200 Subject: [PATCH 2/4] use `.file` when possible --- grafito.art | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/grafito.art b/grafito.art index 61c278552..253b59407 100755 --- a/grafito.art +++ b/grafito.art @@ -69,48 +69,48 @@ graph: function [ ; Global SQL scripts - schemaSQL: split.by:";" read "sql/schema.sql" + schemaSQL: split.by:";" read.file "sql/schema.sql" - createNodeSQL: read "sql/procs/createNode.sql" - updateNodeSQL: read "sql/procs/updateNode.sql" - updateNodePropertySQL: read "sql/procs/updateNodeProperty.sql" - updateNodePropertiesSQL: read "sql/procs/updateNodeProperties.sql" - deleteNodeSQL: read "sql/procs/deleteNode.sql" - deleteNodeEdgesSQL: read "sql/procs/deleteNodeEdges.sql" - getNodeSQL: read "sql/procs/getNode.sql" - getRelatedNodesSQL: read "sql/procs/getRelatedNodes.sql" - getMaxNodeIdSQL: read "sql/procs/getMaxNodeId.sql" + createNodeSQL: read.file "sql/procs/createNode.sql" + updateNodeSQL: read.file "sql/procs/updateNode.sql" + updateNodePropertySQL: read.file "sql/procs/updateNodeProperty.sql" + updateNodePropertiesSQL: read.file "sql/procs/updateNodeProperties.sql" + deleteNodeSQL: read.file "sql/procs/deleteNode.sql" + deleteNodeEdgesSQL: read.file "sql/procs/deleteNodeEdges.sql" + getNodeSQL: read.file "sql/procs/getNode.sql" + getRelatedNodesSQL: read.file "sql/procs/getRelatedNodes.sql" + getMaxNodeIdSQL: read.file "sql/procs/getMaxNodeId.sql" - createEdgeSQL: read "sql/procs/createEdge.sql" - updateEdgeSQL: read "sql/procs/updateEdge.sql" - deleteEdgeSQL: read "sql/procs/deleteEdge.sql" - deleteEdgeByIdSQL: read "sql/procs/deleteEdgeById.sql" + createEdgeSQL: read.file "sql/procs/createEdge.sql" + updateEdgeSQL: read.file "sql/procs/updateEdge.sql" + deleteEdgeSQL: read.file "sql/procs/deleteEdge.sql" + deleteEdgeByIdSQL: read.file "sql/procs/deleteEdgeById.sql" - fetchNodesSQL: read "sql/procs/fetchNodes.sql" - fetchNodesWithEdgesSQL: read "sql/procs/fetchNodes.withEdges.sql" + fetchNodesSQL: read.file "sql/procs/fetchNodes.sql" + fetchNodesWithEdgesSQL: read.file "sql/procs/fetchNodes.withEdges.sql" - countNodesSQL: read "sql/procs/countNodes.sql" - countEdgesSQL: read "sql/procs/countEdges.sql" + countNodesSQL: read.file "sql/procs/countNodes.sql" + countEdgesSQL: read.file "sql/procs/countEdges.sql" ; Global SQL filters - hasEdgeFilter: read "sql/filters/hasEdge.sql" - hasPropertyFilter: read "sql/filters/hasProperty.sql" - edgeWithTargetFilter: read "sql/filters/edgeWithTarget.sql" - edgeWithSourceFilter: read "sql/filters/edgeWithSource.sql" - edgeWithAnyFilter: read "sql/filters/edgeWithAny.sql" - edgeWithPropertiesFilter: read "sql/filters/edgeWithProperties.sql" - nodePropertyWithValueFilter: read "sql/filters/nodePropertyWithValue.sql" - edgePropertyWithValueFilter: read "sql/filters/edgePropertyWithValue.sql" + hasEdgeFilter: read.file "sql/filters/hasEdge.sql" + hasPropertyFilter: read.file "sql/filters/hasProperty.sql" + edgeWithTargetFilter: read.file "sql/filters/edgeWithTarget.sql" + edgeWithSourceFilter: read.file "sql/filters/edgeWithSource.sql" + edgeWithAnyFilter: read.file "sql/filters/edgeWithAny.sql" + edgeWithPropertiesFilter: read.file "sql/filters/edgeWithProperties.sql" + nodePropertyWithValueFilter: read.file "sql/filters/nodePropertyWithValue.sql" + edgePropertyWithValueFilter: read.file "sql/filters/edgePropertyWithValue.sql" ; Global SQL pragmas - caseInsensitiveLikePragma: read "sql/pragmas/caseInsensitiveLike.sql" - caseSensitiveLikePragma: read "sql/pragmas/caseSensitiveLike.sql" + caseInsensitiveLikePragma: read.file "sql/pragmas/caseInsensitiveLike.sql" + caseSensitiveLikePragma: read.file "sql/pragmas/caseSensitiveLike.sql" ; Global UI template - app: read "ui/index.html" + app: read.file "ui/index.html" ; Color palettes ; for graph nodes @@ -1209,14 +1209,14 @@ graph: function [ ] GET "/styles/(?.+)" $[file][ - read ~"ui/styles/|file|" + read.file ~"ui/styles/|file|" ] GET "/scripts/(?.+)" $[file][ (file = "ace/modes/grafito.js")? - -> replace read "ui/scripts/ace/modes/grafito.js" + -> replace read.file "ui/scripts/ace/modes/grafito.js" "CUSTOM_HELPERS" join.with:"|" entities - -> read ~"ui/scripts/|file|" + -> read.file ~"ui/scripts/|file|" ] GET "/exit" [ @@ -1342,7 +1342,7 @@ if standalone? [ BR: "\n" - logoTxt: read "logo.txt" + logoTxt: read.file "logo.txt" GrafitoHeader: join @[ print color #magenta replace logoTxt {/#(.+)/} (color #white "$1") ++ color.keep #magenta "" From 7fb9d62d3c35a662dbb4953a7b358c04c1dc6963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yanis=20Zafir=C3=B3pulos?= <1265028+drkameleon@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:01:48 +0200 Subject: [PATCH 3/4] use relative paths (`./`) when appropriate --- grafito.art | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/grafito.art b/grafito.art index 253b59407..ae026b512 100755 --- a/grafito.art +++ b/grafito.art @@ -69,53 +69,53 @@ graph: function [ ; Global SQL scripts - schemaSQL: split.by:";" read.file "sql/schema.sql" + schemaSQL: split.by:";" read.file ./"sql/schema.sql" - createNodeSQL: read.file "sql/procs/createNode.sql" - updateNodeSQL: read.file "sql/procs/updateNode.sql" - updateNodePropertySQL: read.file "sql/procs/updateNodeProperty.sql" - updateNodePropertiesSQL: read.file "sql/procs/updateNodeProperties.sql" - deleteNodeSQL: read.file "sql/procs/deleteNode.sql" - deleteNodeEdgesSQL: read.file "sql/procs/deleteNodeEdges.sql" - getNodeSQL: read.file "sql/procs/getNode.sql" - getRelatedNodesSQL: read.file "sql/procs/getRelatedNodes.sql" - getMaxNodeIdSQL: read.file "sql/procs/getMaxNodeId.sql" + createNodeSQL: read.file ./"sql/procs/createNode.sql" + updateNodeSQL: read.file ./"sql/procs/updateNode.sql" + updateNodePropertySQL: read.file ./"sql/procs/updateNodeProperty.sql" + updateNodePropertiesSQL: read.file ./"sql/procs/updateNodeProperties.sql" + deleteNodeSQL: read.file ./"sql/procs/deleteNode.sql" + deleteNodeEdgesSQL: read.file ./"sql/procs/deleteNodeEdges.sql" + getNodeSQL: read.file ./"sql/procs/getNode.sql" + getRelatedNodesSQL: read.file ./"sql/procs/getRelatedNodes.sql" + getMaxNodeIdSQL: read.file ./"sql/procs/getMaxNodeId.sql" - createEdgeSQL: read.file "sql/procs/createEdge.sql" - updateEdgeSQL: read.file "sql/procs/updateEdge.sql" - deleteEdgeSQL: read.file "sql/procs/deleteEdge.sql" - deleteEdgeByIdSQL: read.file "sql/procs/deleteEdgeById.sql" + createEdgeSQL: read.file ./"sql/procs/createEdge.sql" + updateEdgeSQL: read.file ./"sql/procs/updateEdge.sql" + deleteEdgeSQL: read.file ./"sql/procs/deleteEdge.sql" + deleteEdgeByIdSQL: read.file ./"sql/procs/deleteEdgeById.sql" - fetchNodesSQL: read.file "sql/procs/fetchNodes.sql" - fetchNodesWithEdgesSQL: read.file "sql/procs/fetchNodes.withEdges.sql" + fetchNodesSQL: read.file ./"sql/procs/fetchNodes.sql" + fetchNodesWithEdgesSQL: read.file ./"sql/procs/fetchNodes.withEdges.sql" - countNodesSQL: read.file "sql/procs/countNodes.sql" - countEdgesSQL: read.file "sql/procs/countEdges.sql" + countNodesSQL: read.file ./"sql/procs/countNodes.sql" + countEdgesSQL: read.file ./"sql/procs/countEdges.sql" ; Global SQL filters - hasEdgeFilter: read.file "sql/filters/hasEdge.sql" - hasPropertyFilter: read.file "sql/filters/hasProperty.sql" - edgeWithTargetFilter: read.file "sql/filters/edgeWithTarget.sql" - edgeWithSourceFilter: read.file "sql/filters/edgeWithSource.sql" - edgeWithAnyFilter: read.file "sql/filters/edgeWithAny.sql" - edgeWithPropertiesFilter: read.file "sql/filters/edgeWithProperties.sql" - nodePropertyWithValueFilter: read.file "sql/filters/nodePropertyWithValue.sql" - edgePropertyWithValueFilter: read.file "sql/filters/edgePropertyWithValue.sql" + hasEdgeFilter: read.file ./"sql/filters/hasEdge.sql" + hasPropertyFilter: read.file ./"sql/filters/hasProperty.sql" + edgeWithTargetFilter: read.file ./"sql/filters/edgeWithTarget.sql" + edgeWithSourceFilter: read.file ./"sql/filters/edgeWithSource.sql" + edgeWithAnyFilter: read.file ./"sql/filters/edgeWithAny.sql" + edgeWithPropertiesFilter: read.file ./"sql/filters/edgeWithProperties.sql" + nodePropertyWithValueFilter: read.file ./"sql/filters/nodePropertyWithValue.sql" + edgePropertyWithValueFilter: read.file ./"sql/filters/edgePropertyWithValue.sql" ; Global SQL pragmas - caseInsensitiveLikePragma: read.file "sql/pragmas/caseInsensitiveLike.sql" - caseSensitiveLikePragma: read.file "sql/pragmas/caseSensitiveLike.sql" + caseInsensitiveLikePragma: read.file ./"sql/pragmas/caseInsensitiveLike.sql" + caseSensitiveLikePragma: read.file ./"sql/pragmas/caseSensitiveLike.sql" ; Global UI template - app: read.file "ui/index.html" + app: read.file ./"ui/index.html" ; Color palettes ; for graph nodes - colorPalettes: #.raw flatten.once map list "ui/palettes" 'pal [ + colorPalettes: #.raw flatten.once map list ./"ui/palettes" 'pal [ @[extract.filename pal, as.data pal] ] @@ -1209,14 +1209,14 @@ graph: function [ ] GET "/styles/(?.+)" $[file][ - read.file ~"ui/styles/|file|" + read.file ./ ~"ui/styles/|file|" ] GET "/scripts/(?.+)" $[file][ (file = "ace/modes/grafito.js")? - -> replace read.file "ui/scripts/ace/modes/grafito.js" + -> replace read.file ./"ui/scripts/ace/modes/grafito.js" "CUSTOM_HELPERS" join.with:"|" entities - -> read.file ~"ui/scripts/|file|" + -> read.file ./ ~"ui/scripts/|file|" ] GET "/exit" [ From 1e4f4b88563b4b830dcbccfe66d0fb29d2132512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yanis=20Zafir=C3=B3pulos?= <1265028+drkameleon@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:03:03 +0200 Subject: [PATCH 4/4] update example --- examples/sample11.art | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sample11.art b/examples/sample11.art index fda50e7ea..395f46ca2 100644 --- a/examples/sample11.art +++ b/examples/sample11.art @@ -2,7 +2,7 @@ ; Import Grafito ; and ... let's rock'n'roll! :) ;--------------------------------------------- -do {grafito.art} +import ./{../grafito.art} do [ ;---------------------------------------------