synapse 2.155.0__py311-none-any.whl → 2.156.0__py311-none-any.whl

synapse/lib/parser.py

@@ -113,10 +113,13 @@ terminalEnglishMap = {
     '_EDGEN1INIT': '-(',
     '_EDGEN2INIT': '<(',
     '_EDGEN2FINI': ')-',
+    '_EDGEN1JOINFINI': ')+>',
+    '_EDGEN2JOININIT': '<+(',
     '_ELSE': 'else',
     '_EMBEDQUERYSTART': '${',
     '_EXPRCOLONNOSPACE': ':',
     '_EMIT': 'emit',
+    '_EMPTY': 'empty',
     '_FINI': 'fini',
     '_HASH': '#',
     '_HASHSPACE': '#',
@@ -131,6 +134,8 @@ terminalEnglishMap = {
     '_RIGHTJOIN': '-+>',
     '_RIGHTPIVOT': '->',
     '_STOP': 'stop',
+    '_WALKNJOINN1': '--+>',
+    '_WALKNJOINN2': '<+--',
     '_WALKNPIVON1': '-->',
     '_WALKNPIVON2': '<--',
     '$END': 'end of input',
@@ -640,6 +645,7 @@ ruleClassMap = {
     'editparens': s_ast.EditParens,
     'emit': s_ast.Emit,
     'initblock': s_ast.InitBlock,
+    'emptyblock': s_ast.EmptyBlock,
     'finiblock': s_ast.FiniBlock,
     'formname': s_ast.FormName,
     'editpropdel': lambda astinfo, kids: s_ast.EditPropDel(astinfo, kids[1:]),
@@ -690,8 +696,12 @@ ruleClassMap = {
     'liftbyformtagprop': s_ast.LiftFormTagProp,
     'looklist': s_ast.LookList,
     'lookup': s_ast.Lookup,
+    'n1join': lambda astinfo, kids: s_ast.N1Walk(astinfo, kids, isjoin=True),
+    'n2join': lambda astinfo, kids: s_ast.N2Walk(astinfo, kids, isjoin=True),
     'n1walk': s_ast.N1Walk,
     'n2walk': s_ast.N2Walk,
+    'n1walknjoin': lambda astinfo, kids: s_ast.N1WalkNPivo(astinfo, kids, isjoin=True),
+    'n2walknjoin': lambda astinfo, kids: s_ast.N2WalkNPivo(astinfo, kids, isjoin=True),
     'n1walknpivo': s_ast.N1WalkNPivo,
     'n2walknpivo': s_ast.N2WalkNPivo,
     'notcond': s_ast.NotCond,

synapse/lib/snap.py

@@ -301,11 +301,7 @@ class ProtoNode:
         if self.node is not None:
             return self.node.get(name)
 
-    async def set(self, name, valu, norminfo=None):
-
-        prop = self.form.props.get(name)
-        if prop is None:
-            return False
+    async def _set(self, prop, valu, norminfo=None):
 
         if prop.locked:
             mesg = f'Prop {prop.full} is locked due to deprecation.'
@@ -339,7 +335,7 @@ class ProtoNode:
                 await self.ctx.snap._raiseOnStrict(s_exc.IsDeprLocked, mesg)
                 return False
 
-        curv = self.get(name)
+        curv = self.get(prop.name)
         if curv == valu:
             return False
 
@@ -351,7 +347,20 @@ class ProtoNode:
         if self.node is not None:
             await self.ctx.snap.core._callPropSetHook(self.node, prop, valu)
 
-        self.props[name] = valu
+        self.props[prop.name] = valu
+
+        return valu, norminfo
+
+    async def set(self, name, valu, norminfo=None):
+        prop = self.form.props.get(name)
+        if prop is None:
+            return False
+
+        retn = await self._set(prop, valu, norminfo=norminfo)
+        if retn is False:
+            return False
+
+        (valu, norminfo) = retn
 
         propform = self.ctx.snap.core.model.form(prop.type.name)
         if propform is not None:
@@ -372,6 +381,37 @@ class ProtoNode:
 
         return True
 
+    async def getSetOps(self, name, valu, norminfo=None):
+        prop = self.form.props.get(name)
+        if prop is None:
+            return ()
+
+        retn = await self._set(prop, valu, norminfo=norminfo)
+        if retn is False:
+            return ()
+
+        (valu, norminfo) = retn
+        ops = []
+
+        propform = self.ctx.snap.core.model.form(prop.type.name)
+        if propform is not None:
+            ops.append(self.ctx.getAddNodeOps(propform.name, valu, norminfo=norminfo))
+
+        # TODO can we mandate any subs are returned pre-normalized?
+        propsubs = norminfo.get('subs')
+        if propsubs is not None:
+            for subname, subvalu in propsubs.items():
+                full = f'{prop.name}:{subname}'
+                if self.form.props.get(full) is not None:
+                    ops.append(self.getSetOps(full, subvalu))
+
+        propadds = norminfo.get('adds')
+        if propadds is not None:
+            for addname, addvalu, addinfo in propadds:
+                ops.append(self.ctx.getAddNodeOps(addname, addvalu, norminfo=addinfo))
+
+        return ops
+
 class SnapEditor:
     '''
     A SnapEditor allows tracking node edits with subs/deps as a transaction.
@@ -394,17 +434,12 @@ class SnapEditor:
                 nodeedits.append(nodeedit)
         return nodeedits
 
-    async def addNode(self, formname, valu, props=None, norminfo=None):
+    async def _addNode(self, form, valu, props=None, norminfo=None):
 
         self.snap.core._checkMaxNodes()
 
-        form = self.snap.core.model.form(formname)
-        if form is None:
-            mesg = f'No form named {formname} for valu={valu}.'
-            return await self.snap._raiseOnStrict(s_exc.NoSuchForm, mesg)
-
         if form.isrunt:
-            mesg = f'Cannot make runt nodes: {formname}.'
+            mesg = f'Cannot make runt nodes: {form.name}.'
             return await self.snap._raiseOnStrict(s_exc.IsRuntForm, mesg)
 
         if form.locked:
@@ -417,15 +452,73 @@ class SnapEditor:
             except s_exc.BadTypeValu as e:
                 e.errinfo['form'] = form.name
                 if self.snap.strict: raise e
-                await self.snap.warn(f'addNode() BadTypeValu {formname}={valu} {e}')
+                await self.snap.warn(f'addNode() BadTypeValu {form.name}={valu} {e}')
                 return None
 
+        return valu, norminfo
+
+    async def addNode(self, formname, valu, props=None, norminfo=None):
+
+        form = self.snap.core.model.form(formname)
+        if form is None:
+            mesg = f'No form named {formname} for valu={valu}.'
+            return await self.snap._raiseOnStrict(s_exc.NoSuchForm, mesg)
+
+        retn = await self._addNode(form, valu, props=props, norminfo=norminfo)
+        if retn is None:
+            return None
+
+        valu, norminfo = retn
+
         protonode = await self._initProtoNode(form, valu, norminfo)
         if props is not None:
             [await protonode.set(p, v) for (p, v) in props.items()]
 
         return protonode
 
+    async def getAddNodeOps(self, formname, valu, props=None, norminfo=None):
+
+        form = self.snap.core.model.form(formname)
+        if form is None:
+            mesg = f'No form named {formname} for valu={valu}.'
+            await self.snap._raiseOnStrict(s_exc.NoSuchForm, mesg)
+            return()
+
+        retn = await self._addNode(form, valu, props=props, norminfo=norminfo)
+        if retn is None:
+            return ()
+
+        norm, norminfo = retn
+
+        ndef = (form.name, norm)
+
+        protonode = self.protonodes.get(ndef)
+        if protonode is not None:
+            return ()
+
+        buid = s_common.buid(ndef)
+        node = await self.snap.getNodeByBuid(buid)
+        if node is not None:
+            return ()
+
+        protonode = ProtoNode(self, buid, form, norm, node)
+
+        self.protonodes[ndef] = protonode
+
+        ops = []
+
+        subs = norminfo.get('subs')
+        if subs is not None:
+            for prop, valu in subs.items():
+                ops.append(protonode.getSetOps(prop, valu))
+
+        adds = norminfo.get('adds')
+        if adds is not None:
+            for addname, addvalu, addinfo in adds:
+                ops.append(self.getAddNodeOps(addname, addvalu, norminfo=addinfo))
+
+        return ops
+
     def loadNode(self, node):
         protonode = self.protonodes.get(node.ndef)
         if protonode is None:
@@ -448,14 +541,25 @@ class SnapEditor:
 
         self.protonodes[ndef] = protonode
 
+        ops = collections.deque()
+
         subs = norminfo.get('subs')
         if subs is not None:
-            [await protonode.set(p, v) for (p, v) in subs.items()]
+            for prop, valu in subs.items():
+                ops.append(protonode.getSetOps(prop, valu))
+
+            while ops:
+                oset = ops.popleft()
+                ops.extend(await oset)
 
         adds = norminfo.get('adds')
         if adds is not None:
             for addname, addvalu, addinfo in adds:
-                await self.addNode(addname, addvalu, norminfo=addinfo)
+                ops.append(self.getAddNodeOps(addname, addvalu, norminfo=addinfo))
+
+            while ops:
+                oset = ops.popleft()
+                ops.extend(await oset)
 
         return protonode
 
@@ -469,8 +573,6 @@ class Snap(s_base.Base):
 
     Transactions produce the following EventBus events:
 
-    (...any splice...)
-    ('log', {'level': 'mesg': })
     ('print', {}),
     '''
     tagcachesize = 1000
@@ -598,7 +700,6 @@ class Snap(s_base.Base):
 
             yield pode
 
-    @s_coro.genrhelp
     async def storm(self, text, opts=None, user=None):
         '''
         Execute a storm query and yield (Node(), Path()) tuples.
@@ -616,7 +717,6 @@ class Snap(s_base.Base):
             async for x in runt.execute():
                 yield x
 
-    @s_coro.genrhelp
     async def eval(self, text, opts=None, user=None):
         '''
         Run a storm query and yield Node() objects.

synapse/lib/storm.lark

@@ -63,10 +63,10 @@ SETTAGOPER: "?"
 
 // The set of non-edit non-commands in storm
 
-_oper: stormfunc | initblock | finiblock | trycatch | subquery | _formpivot | formjoin | formpivotin
-     | formjoinin | opervarlist | setitem | setvar | vareval | filtoper
+_oper: stormfunc | initblock | emptyblock | finiblock | trycatch | subquery | _formpivot | formjoin
+     | formpivotin | formjoinin | opervarlist | setitem | setvar | vareval | filtoper
      | operrelprop | forloop | whileloop | switchcase | BREAK | CONTINUE | return | emit | stop
-     | _liftprop | ifstmt | yieldvalu | n1walk | n2walk | n1walknpivo | n2walknpivo | rawpivot
+     | _liftprop | ifstmt | yieldvalu | n1walk | n2walk | n1join | n2join | n1walknpivo | n2walknpivo | n1walknjoin | n2walknjoin | rawpivot
 
 BREAK.4: /break(?=[\s\}])/
 CONTINUE.4: /continue(?=[\s\}])/
@@ -106,6 +106,9 @@ yieldvalu: YIELD _argvalu
 _INIT.2: /init(?=[\s\{])/
 initblock: _INIT "{" query "}"
 
+_EMPTY.2: /empty(?=[\s\{])/
+emptyblock: _EMPTY "{" query "}"
+
 _FINI.2: /fini(?=[\s\{])/
 finiblock: _FINI "{" query "}"
 
@@ -148,7 +151,7 @@ rawpivot: _RIGHTPIVOT "{" query "}"
 _RIGHTJOIN.4:  "-+>"
 _LEFTJOIN.4:   "<+-"
 _RIGHTPIVOT.4: "->"
-_LEFTPIVOT.4:  "<-"
+_LEFTPIVOT.4:  /<\-[^0-9]/
 
 _liftprop: liftformtag | liftpropby | liftprop | liftbyarray
             | liftbytagprop | liftbyformtagprop | liftbytag | lifttagtag
@@ -163,20 +166,33 @@ n1walk: _EDGEN1INIT (walklist | varlist | _varvalu | relpropvalu | univpropvalu
 
 n2walk: _EDGEN2INIT _valu _EDGEN2FINI _wildprops [ _cmpr _valu ]
 
+n1join: _EDGEN1INIT (walklist | varlist | _varvalu | relpropvalu | univpropvalu | tagvalu | tagpropvalu | TRIPLEQUOTEDSTRING | formatstring | VARTOKN | embedquery | baresubquery | NONQUOTEWORD | ABSPROPNOUNIV) _EDGEN1JOINFINI _wildprops [ _cmpr _valu ]
+
+n2join: _EDGEN2JOININIT _valu _EDGEN2FINI _wildprops [ _cmpr _valu ]
+
 walklist: ("(" (_varvalu | relpropvalu | univpropvalu | tagvalu | tagpropvalu | TRIPLEQUOTEDSTRING | formatstring | VARTOKN | NONQUOTEWORD | ABSPROP) ((",")|("," (_varvalu | relpropvalu | univpropvalu | tagvalu | tagpropvalu | TRIPLEQUOTEDSTRING | formatstring | VARTOKN | NONQUOTEWORD | ABSPROP))+ ","?) ")") -> valulist
 
+_WALKNJOINN1.4: "--+>"
+_WALKNJOINN2.4: "<+--"
+
 _WALKNPIVON1.4: "-->"
 _WALKNPIVON2.4: "<--"
 
 n1walknpivo: _WALKNPIVON1 "*"
 n2walknpivo: _WALKNPIVON2 "*"
 
+n1walknjoin: _WALKNJOINN1 "*"
+n2walknjoin: _WALKNJOINN2 "*"
+
 _EDGEADDN1INIT.2: "+("
 _EDGEN1INIT.2: "-("
 _EDGEN1FINI: ")>"
 _EDGEADDN2FINI: ")+"
 _EDGEN2FINI: ")-"
 
+_EDGEN1JOINFINI: ")+>"
+_EDGEN2JOININIT: "<+("
+
 // Regex to check for a matching ')-' or ')+' so we can avoid incorrectly matching
 // comparisons to an expression like '<(2)'
 _EDGEN2INIT: /\<\((?=(?>(?<EDGEN2INITRECUR>\(((?>[^()"'`]+|(?&EDGEN2INITRECUR)|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'''.*?'''|'[^']*'(?!'))*)\))|'''.*?'''|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'[^']*'(?!')|[^)])*\)[\-\+])/
@@ -214,7 +230,7 @@ stormcmdargs: _stormcmdarg
 _stormcmdarg: _stormcmdarg? ((CMDOPT (EQNOSPACE (argvquery | _argvalu | wordtokn))?) | argvquery | _argvalu | wordtokn)
 
 // The name of a storm command
-CMDNAME.2: /(?!(init|fini|function|return|emit|stop|yield|break|continue|for|while|switch|else|elif|if|not|or|and|try|catch|as|reverse)\b)[a-z][a-z0-9.]+(?=[\s\|\}]|$)/
+CMDNAME.2: /(?!(init|empty|fini|function|return|emit|stop|yield|break|continue|for|while|switch|else|elif|if|not|or|and|try|catch|as|reverse)\b)[a-z][a-z0-9.]+(?=[\s\|\}]|$)/
 
 CMDOPT.4: /(?<=\s)-[a-zA-Z0-9_-]+(?![:a-zA-Z0-9_><-])/
 
@@ -258,8 +274,9 @@ _MATCHHASHWILD.3: /\#
             <\(
             (?=(?>(?<N2MATCHRECUR>\(((?>[^()"'`]+|(?&N2MATCHRECUR)|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'''.*?'''|'[^']*'(?!'))*)\))|'''.*?'''|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'[^']*'(?!')|[^)])*\)-
             )
+            | <(\+|-[^0-9])                          # avoid matching joins or pivots
         )
-        [@?!<>^~=]+                                # match any cmprs (regex fail)
+        [@?!<>^~=]+                                  # match any cmprs (regex fail)
     )
 )
 /x