linked-data-python 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

ldpy/lsp/islanddoc.py

@@ -45,11 +45,13 @@ ISLANDS = {
     # -- declarations -------------------------------------------------------
 
     "prefix": IslandDoc(
-        "(declaration) @prefix ex: <IRI> .",
+        "(declaration) @prefix ex: <IRI> [as EX] .",
         "Binds `ex:` to a namespace IRI for the rest of the enclosing block. "
-        "A prefix is lexical: it has no run-time object, and `ex:` on its own "
-        "is never a value. Declaring it again in a deeper block shadows it, "
-        "the way a Python name would.",
+        "A prefix is lexical: `ex:` on its own is never a value. When the "
+        "code needs the Namespace as an OBJECT — to `bind()` it on a graph, "
+        "to export it, to put it in a registry — `as EX` binds that object "
+        "to a Python name too. Declaring the prefix again in a deeper block "
+        "shadows it, the way a Python name would.",
         _DECLS, "prefix-bind-a-prefix"),
 
     "base": IslandDoc(
@@ -69,7 +71,9 @@ ISLANDS = {
         "(declaration) @graph EXPR | @graph as NAME -> Graph",
         "Designates the current graph for the block — the one `+{ }`, `-{ }` "
         "and a receiver-less `m{ }` act on. `as NAME` creates a fresh graph "
-        "and binds it to NAME; `global` and `nonlocal` widen the scope.",
+        "and binds it to NAME; `global` and `nonlocal` widen the scope. "
+        "Either way the graph inherits the block's prefixes, so it "
+        "serialises with them.",
         _CURRENT, "graph-designate-or-create"),
 
     "bindings-decl": IslandDoc(
@@ -134,7 +138,9 @@ ISLANDS = {
         "A SPARQL query or update, parsed when the file is transpiled rather "
         "than at run time. `{expr}` in term position becomes an initial "
         "binding — never string pasting, so nothing here can be injected. "
-        "Call it on a graph to run it; `.execute()` runs an update.",
+        "Calling it on a graph gives a LAZY query; `.execute()` is what "
+        "forces it — for an update, and for any query whose rdflib `Result` "
+        "you then call a method on.",
         _QUERY, "s-a-sparql-query"),
 
     # -- terms --------------------------------------------------------------
@@ -169,10 +175,10 @@ ISLANDS = {
 
     "firi": IslandDoc(
         "(term) f<...{expr}...> -> URIRef",
-        "A formatted IRI: the braces interpolate as in an f-string, the "
-        "result is percent-encoded and then resolved against `@base`. "
-        "Encoding first is what keeps a space or a slash in a value from "
-        "changing the IRI's structure.",
+        "A formatted IRI: the braces interpolate as in an f-string, and the "
+        "result is resolved against `@base` if it is relative. It does NOT "
+        "percent-encode — the shape of the IRI is yours. To mint one from "
+        "data that may hold a space or a slash, use `e<...>`, which encodes.",
         _TERMS, "formatted-iris-f"),
 
     "fnode": IslandDoc(
@@ -202,7 +208,9 @@ ISLANDS = {
     "eiri": IslandDoc(
         "(expression) e<...{?var}...> -> Expr",
         "A deferred IRI: `f<...>`'s interpolation, except that the holes are "
-        "SPARQL expressions re-evaluated for each set of bindings.",
+        "SPARQL expressions re-evaluated for each set of bindings — and that "
+        "it percent-encodes what it interpolates. This is the form for "
+        "minting an IRI from a data column.",
         _SPARQL_EXPR, "deferred-iris-e"),
 }
 

ldpy/pygments_lexer.py

@@ -254,6 +254,10 @@ _NO_CURRENT_GRAPH = re.compile(r"sans graphe courant")
 #: input from looping.
 _MAX_SYNTHETIC = 24
 
+#: `as EX` closing a prefix declaration (record ldpy/027).
+_PREFIX_AS_RE = re.compile(
+    r"(>)(\s+)(as)(\s+)([A-Za-z_]\w*)(?=\s*\.)")
+
 #: Namespace of the synthetic prefixes. Never resolved — the map is thrown
 #: away after the tokens are read — but it has to be a legal IRI.
 _SYNTHETIC_NS = "urn:x-ldpy-highlight:"
@@ -400,10 +404,26 @@ class LdpyLexer(Lexer):
 
     # -- the ldpy-specific regions of an island body -------------------------
 
+    def _emit_prefix_as(self, text, m):
+        """The `as EX` of a prefix declaration: a keyword and a Python name."""
+        def emit(offset):
+            yield offset + m.start(3), Keyword, m.group(3)
+            yield offset + m.end(3), Text, m.group(4)
+            yield offset + m.start(5), Name.Variable, m.group(5)
+        return emit
+
     def _regions(self, text, flavour, is_query=False):
         """Locate what no Turtle or SPARQL lexer can read: interpolations and
         nested islands. Each becomes a (start, end, emit) region."""
         regions = []
+        if flavour == "turtle":
+            # `@prefix ex: <IRI> as EX .` (record ldpy/027): Turtle's own
+            # lexer knows the directive but not the clause, and would mark it
+            # Error. Mask it and emit it ourselves.
+            m = _PREFIX_AS_RE.search(text)
+            if m:
+                regions.append((m.start(3), m.end(5),
+                                self._emit_prefix_as(text, m)))
         i, n = 0, len(text)
         while i < n:
             c = text[i]

ldpy/runtime.py

@@ -708,6 +708,30 @@ def new_graph(namespaces, base, identifier=None):
     return g
 
 
+def designate(namespaces, graph):
+    """'@graph EXPR' — the designated graph inherits the block's prefixes.
+
+    A graph CREATED by '@graph as g' already serialises with the prefixes in
+    scope (:func:`new_graph`); a graph merely DESIGNATED did not, so the same
+    block writing the same prefixed names into two graphs produced two
+    different serialisations. That was an inconsistency rather than a
+    decision, and record ldpy/027 settles it: both inherit.
+
+    The bindings are added to the graph's OWN manager, never by swapping it
+    for the shared cached one — a designated graph belongs to the caller and
+    may already carry bindings that matter. Anything that is not a graph, or
+    a backend without a namespace manager, passes through untouched: the
+    declaration's job is to designate, and it must not fail on the shape of
+    what it is given.
+    """
+    if namespaces:
+        try:
+            _backend.bind_namespaces(graph, namespaces)
+        except (AttributeError, TypeError):
+            pass                    # not a graph, or no binding support
+    return graph
+
+
 def add_to(graph, *triples, bindings=None):
     """'+{ ... }': instantiate and add to the current graph (record ldpy/014).
     A triple with a term still unbound is dropped — one cannot write an

ldpy/transpiler/core.py

@@ -592,6 +592,40 @@ class Transpiler:
     # chaînes et littéraux RDF
     # ------------------------------------------------------------------
 
+    # Island sigils that open with a brace or a chevron.  A hole beginning
+    # with one of these is an island the scanner will never reach.
+    _HOLE_ISLANDS = ("_:{", "g{", "m{", "s{", "e{", "e<", "f{", "f<", "?{")
+
+    def _island_in_fstring_hole(self, tok_start, end):
+        """The island opener written inside an f-string hole, or None.
+
+        The scanner does not descend into f-string interpolation holes: an
+        island written there would be copied verbatim into the generated
+        Python, which then fails with a message from CPython's f-string
+        parser that names nothing (record ldpy/012). Refusing it here, by
+        name, costs one scan of the token and turns a baffling failure into
+        an actionable one.
+        """
+        tok = self.text[tok_start:end]
+        if "f" not in tok[:3].lower() or "{" not in tok:
+            return None
+        i, n = 0, len(tok)
+        while i < n:
+            if tok[i] != "{":
+                i += 1
+                continue
+            if tok[i + 1:i + 2] == "{":         # '{{' is an escaped brace
+                i += 2
+                continue
+            j = i + 1
+            while j < n and tok[j] in " \t":
+                j += 1
+            for opener in self._HOLE_ISLANDS:
+                if tok.startswith(opener, j):
+                    return opener
+            i += 1
+        return None
+
     def _handle_string(self, start, prefix_start=None):
         """start : indice du guillemet. prefix_start : indice du préfixe de
         chaîne (r/b/f/u) déjà repéré, sinon None."""
@@ -607,6 +641,12 @@ class Transpiler:
         if suffix is None and t[end:end + 2] == "^^":
             suffix = ("datatype", None, end + 2)
         if suffix is None:
+            opener = self._island_in_fstring_hole(tok_start, end)
+            if opener is not None:
+                self._error(
+                    "îlot '%s' dans un trou d'f-string : le scanner n'y "
+                    "descend pas. Sortez la lecture dans une variable "
+                    "au-dessus de l'f-string." % opener)
             self._copy(end - self.i)
             self.operand = False
             self.stmt_start = False
@@ -1280,6 +1320,7 @@ class Transpiler:
         if end is None:
             return False
         k = self._skip_ws_ahead(end)
+        as_name, k = self._prefix_as_clause(k)
         if k >= self.n or t[k] != ".":
             return False
         # consommation effective
@@ -1308,9 +1349,40 @@ class Transpiler:
                                 scope_mode)
             gen = "__namespaces__[%r] = %s.Namespace(%r)" % (
                 prefix, RUNTIME_ALIAS, resolved)
+            if as_name:
+                # `as EX` binds the Namespace OBJECT to a Python name, for the
+                # code that needs it to survive the block (record ldpy/027).
+                gen = "__namespaces__[%r] = %s = %s.Namespace(%r)" % (
+                    prefix, as_name, RUNTIME_ALIAS, resolved)
+                if scope_mode:
+                    gen = "%s %s; %s" % (scope_mode, as_name, gen)
         self._end_island(kind, mark, gen)
         return True
 
+    def _prefix_as_clause(self, k):
+        """`as NAME` before a @prefix declaration's closing '.', or nothing.
+
+        `@prefix` is lexical and yields no Python value, which the corpus
+        study showed to be its most attested limit: code that must keep the
+        `Namespace` as an OBJECT — to `g.bind()` it, to export it, to put it
+        in a registry — had no translation at all (record ldpy/027). `as EX`
+        binds that object, without making a bare `ex:` a value (records
+        ldpy/002 and 004 refuse that, and still do).
+
+        Returns `(name, index after the clause)`; `(None, k)` when absent.
+        """
+        t = self.text
+        if t[k:k + 2] != "as":
+            return None, k
+        if k + 2 < self.n and _name_char(t[k + 2]):
+            return None, k                      # `assets`, not `as`
+        j = self._skip_ws_ahead(k + 2)
+        m = _PYNAME_RE.match(t, j)
+        if not m or j == k + 2:
+            self._error("nom Python attendu après 'as' dans la "
+                        "déclaration @prefix")
+        return m.group(0), self._skip_ws_ahead(m.end())
+
     def _prefix_firi_decl(self, j, prefix, scope_mode=None):
         """Consomme `@prefix p: f<...> .` (self.i sur '@', j sur 'f').
         Sans interpolation : déclaration statique ordinaire. Avec : préfixe
@@ -1539,7 +1611,10 @@ class Transpiler:
                     self._error("expression attendue après '@graph'")
                 if "\n" in expr:
                     self._error("l'expression de '@graph' tient sur sa ligne")
-                rhs = "(%s)" % expr
+                # The designated graph inherits the block's prefixes, exactly
+                # as a created one does (record ldpy/027).
+                rhs = "%s.designate(__namespaces__, (%s))" % (
+                    RUNTIME_ALIAS, expr)
         self._graph_ws_inline()
         if self._peek() not in "\n\r#;" and self._peek() != "":
             self._error("fin de ligne attendue après la déclaration @graph")
@@ -2124,6 +2199,14 @@ class Transpiler:
             elif c in "\"'":
                 end = self._string_end(self.i)
                 pieces.append(self._take(end - self.i))
+            elif c == "<" and self._iriref_end(self.i) is not None:
+                # A full IRI is a token, not punctuation: its '#' is part of
+                # the IRI, not a comment. Without this the fragment of
+                # <http://example.org/ns#X> — the most ordinary shape an IRI
+                # takes in RDF — swallowed the rest of the line, closing
+                # brace included. `<` that does NOT open an IRI is SPARQL's
+                # less-than, and falls through to the single-character case.
+                pieces.append(self._take(self._iriref_end(self.i) - self.i))
             elif c == "#":
                 j = t.find("\n", self.i)
                 pieces.append(self._take((j if j != -1 else self.n) - self.i))

{linked_data_python-0.6.1.dist-info → linked_data_python-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linked-data-python
-Version: 0.6.1
+Version: 0.6.3
 Summary: Python extended with Semantic Web primitives: IRIs, RDF literals and Turtle-notation graphs as expressions, transpiled by island parsing.
 Author-email: Maxime Lefrançois <maxime.lefrancois@emse.fr>
 License: MIT

{linked_data_python-0.6.1.dist-info → linked_data_python-0.6.3.dist-info}/RECORD

@@ -6,24 +6,24 @@ ldpy/console.py,sha256=vMSnFFoOIOcanw6_niNxqgrt-F4gzMOrD1GopkXru5s,4837
 ldpy/debug.py,sha256=JUuzeKc8ya4SG30AxaUVeihTEbzySo1cS0sU0s78Mv0,10493
 ldpy/formatter.py,sha256=VaDPECxhivsMe8jnX_fOL7BUyLEu5r4xREdr4Hav-0c,12695
 ldpy/importer.py,sha256=QXAhSujPN6rFMJSQuj0UsWyI4CajirKt1SOrykJ_fUw,3670
-ldpy/pygments_lexer.py,sha256=mcQ0u9nZjLnSWpqzcxd6bZjk69LfKSNTsf9A3rqfhhk,25320
-ldpy/runtime.py,sha256=vkk9HQvUpi6pET0S4EqH1sA3797eA89NeTzHz9dLT_w,39632
+ldpy/pygments_lexer.py,sha256=fmqYytdnovqfXemuKE5lg4XG1iub-hui9otXERBWELw,26217
+ldpy/runtime.py,sha256=jOFR8lg4tVOP-H_2-cO-Q5SEyW7iz1y0nmZ3QkSlThU,40736
 ldpy/sparql.py,sha256=yPe-ZR1tpY--nM6q5LYXyXP7zlkE4gqhIRYAKwfpTBg,14851
 ldpy/lsp/__init__.py,sha256=rK5GYOITi9PN09-WVlJ2aPKodW8dWTpgI_X6dFbP1zA,542
 ldpy/lsp/__main__.py,sha256=MIp4ktqaoWZCNIMfv14bSC9pqK86JBS5XVjd1Z3c24o,72
 ldpy/lsp/backend.py,sha256=8DnSGaBk1dsIMOBo7D1WQxxF3MZjJbYd78jp4ucWORY,5375
 ldpy/lsp/hover.py,sha256=zSJ0PpU3kTJDXcwI2zSDCbsKrT-eNTt2RlvmEPRoV-M,2407
-ldpy/lsp/islanddoc.py,sha256=vxxRKEcywBH31c8XgykEoC8fZfvbHok1NH-rPc-0Sy0,9540
+ldpy/lsp/islanddoc.py,sha256=kyW9R38otc66OG2SxhzKKwb8AG--LAbDkV1tc2Xv5pg,10120
 ldpy/lsp/rpc.py,sha256=-TF_9U8dum23Pi4O1FZLogwoZgrGrt14J5BFB1OYVZw,3554
 ldpy/lsp/server.py,sha256=PAMMookGUn00vAW_-a5BGy3qkVe9PoUdfzAzpdlvoF8,16359
 ldpy/lsp/translate.py,sha256=HU9fBP_xWyYLih6QwQfSoyfF-MH-oInFcPX3o8Vc2GI,6116
 ldpy/transpiler/__init__.py,sha256=9mQx0e47ixz0iMqSbCBbtGiwJ7PLxTcsVSIp6KNTMG4,504
-ldpy/transpiler/core.py,sha256=LaZT8hE4jocIcTLyb2kc_mFtwu8QTSm0FhOMNetY_2k,114831
+ldpy/transpiler/core.py,sha256=ySjfXkKKuKGFKwwlzgbm19f3wVWE1ecZL10pSy63xBo,118921
 ldpy/transpiler/errors.py,sha256=zEEwsNvC2Tawq8jIYls7hrbcWSvQtd7eo89k_SKp0k0,1142
 ldpy/transpiler/linemap.py,sha256=ecLlCUkD4-6QQtUjGfAL28ql7LPITTS4fjLcDIbAwpQ,11386
-linked_data_python-0.6.1.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
-linked_data_python-0.6.1.dist-info/METADATA,sha256=SM4kVwA-gnxAZdihLeDPLR3Sys8n0iauEh40yw-8g_4,7974
-linked_data_python-0.6.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-linked_data_python-0.6.1.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
-linked_data_python-0.6.1.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
-linked_data_python-0.6.1.dist-info/RECORD,,
+linked_data_python-0.6.3.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
+linked_data_python-0.6.3.dist-info/METADATA,sha256=xtxE9wzvbhj1pnknzO3JZb0Pa9Y0ECyUZHDrnJzKyTY,7974
+linked_data_python-0.6.3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+linked_data_python-0.6.3.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
+linked_data_python-0.6.3.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
+linked_data_python-0.6.3.dist-info/RECORD,,