Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove special assert syntax #894

Merged
merged 1 commit into from
Sep 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 2 additions & 51 deletions src/clj/fluree/db/flake/flake_db.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -123,63 +123,14 @@
:namespace-codes new-ns-codes
:max-namespace-code max-namespace-code*)))

(defn enrich-values
[id->node values]
(mapv (fn [{:keys [id type] :as v-map}]
(if id
(merge (get id->node id)
(cond-> v-map
(nil? type) (dissoc :type)))
v-map))
values))

(defn enrich-node
[id->node node]
(reduce-kv
(fn [updated-node k v]
(assoc updated-node k (cond (= :id k) v
(:list (first v)) [{:list (enrich-values id->node (:list (first v)))}]
:else (enrich-values id->node v))))
{}
node))

(defn enrich-assertion-values
"`asserts` is a json-ld flattened (ish) sequence of nodes. In order to properly generate
sids (or pids) for these nodes, we need the full node additional context for ref objects. This
function traverses the asserts and builds a map of node-id->node, then traverses the
asserts again and merges each ref object into the ref's node.

example input:
[{:id \"foo:bar\"
\"ex:key1\" {:id \"foo:ref-id\"}}
{:id \"foo:ref-id\"
:type \"some:type\"}]

example output:
[{:id \"foo:bar\"
\"ex:key1\" {:id \"foo:ref-id\"
:type \"some:type\"}}
{:id \"foo:ref-id\"
:type \"some:type\"}]
"
[asserts]
(let [id->node (reduce (fn [id->node {:keys [id] :as node}] (assoc id->node id node))
{}
asserts)]
(mapv (partial enrich-node id->node)
asserts)))

(defn db-assert
[db-data]
(let [commit-assert (get db-data const/iri-assert)]
;; TODO - any basic validation required
(enrich-assertion-values commit-assert)))
(get db-data const/iri-assert))

(defn db-retract
[db-data]
(let [commit-retract (get db-data const/iri-retract)]
;; TODO - any basic validation required
commit-retract))
(get db-data const/iri-retract))

(defn commit-error
[message commit-data]
Expand Down