@traqula/rules-sparql-1-2 0.0.7 → 0.0.9

package/lib/index.cjs

@@ -12902,7 +12902,7 @@ var inlineData = {
     return ACTION(() => C.factory.patternValues(datablock.val, C.factory.sourceLocation(values3, datablock)));
   },
   gImpl: ({ SUBRULE, PRINT_WORD }) => (ast, { factory: F3 }) => {
-    const variables = Object.keys(ast.values[0]);
+    const variables = Object.keys(ast.values.at(0) ?? {});
     F3.printFilter(ast, () => {
       PRINT_WORD("VALUES", "(");
       for (const variable of variables) {
@@ -13127,7 +13127,7 @@ var argList = {
     F3.printFilter(ast, () => {
       PRINT_WORD("(");
       if (ast.val.distinct) {
-        PRINT_WORD("distinct");
+        PRINT_WORD("DISTINCT");
       }
     });
     const [head2, ...tail] = ast.val.args;
@@ -13181,7 +13181,7 @@ var expression = {
           } else if (ast.operator === "in") {
             PRINT_WORD("IN");
           } else {
-            PRINT_WORD(ast.operator);
+            PRINT_WORD(ast.operator.toUpperCase());
           }
         });
         if (right.length === 1) {
@@ -13192,10 +13192,10 @@ var expression = {
         F3.printFilter(ast, () => PRINT_WORD(")"));
       } else if (prefixOperator.has(ast.operator)) {
         const [expr] = ast.args;
-        F3.printFilter(ast, () => PRINT_WORD(ast.operator));
+        F3.printFilter(ast, () => PRINT_WORD(ast.operator.toUpperCase()));
         SUBRULE(expression, expr);
       } else {
-        F3.printFilter(ast, () => PRINT_WORD(ast.operator, "("));
+        F3.printFilter(ast, () => PRINT_WORD(ast.operator.toUpperCase(), "("));
         const [head2, ...tail] = ast.args;
         if (head2) {
           SUBRULE(expression, head2);
@@ -14105,11 +14105,18 @@ var update = {
     });
   },
   gImpl: ({ SUBRULE, PRINT_WORD }) => (ast, { factory: F3 }) => {
-    for (const update2 of ast.updates) {
+    const [head2, ...tail] = ast.updates;
+    if (head2) {
+      SUBRULE(prologue, head2.context);
+      if (head2.operation) {
+        SUBRULE(update1, head2.operation);
+      }
+    }
+    for (const update2 of tail) {
+      F3.printFilter(ast, () => PRINT_WORD(";\n"));
       SUBRULE(prologue, update2.context);
       if (update2.operation) {
         SUBRULE(update1, update2.operation);
-        F3.printFilter(ast, () => PRINT_WORD(" ;\n"));
       }
     }
   }
@@ -14572,6 +14579,13 @@ var queryOrUpdate = {
         });
       } }
     ]);
+  },
+  gImpl: ({ SUBRULE }) => (ast, { factory: F3 }) => {
+    if (F3.isQuery(ast)) {
+      SUBRULE(query, ast);
+    } else {
+      SUBRULE(update, ast);
+    }
   }
 };
 

package/lib/lexer.d.ts

@@ -17,4 +17,4 @@ export declare const buildInSUBJECT: import("@traqula/core").NamedToken<"BuiltIn
 export declare const buildInPREDICATE: import("@traqula/core").NamedToken<"BuiltInPredicate">;
 export declare const buildInOBJECT: import("@traqula/core").NamedToken<"BuiltInObject">;
 export declare const LANG_DIR: import("@traqula/core").NamedToken<"LANG_DIR">;
-export declare const sparql12LexerBuilder: LexerBuilder<"From" | "DefaultGraph" | "BuiltInStr" | "BuiltInLang" | "BuiltInLangmatches" | "BuiltInDatatype" | "BuiltInBound" | "BuiltInIri" | "BuiltInUri" | "BuiltInBnode" | "BuiltInRand" | "BuiltInAbs" | "BuiltInCeil" | "BuiltInFloor" | "BuiltInRound" | "BuiltInConcat" | "BuiltInStrlen" | "BuiltInUcase" | "BuiltInLcase" | "BuiltInEncode_for_uri" | "BuiltInContains" | "BuiltInStrstarts" | "BuiltInStrends" | "BuiltInStrbefore" | "BuiltInStrafter" | "BuiltInYear" | "BuiltInMonth" | "BuiltInDay" | "BuiltInHours" | "BuiltInMinutes" | "BuiltInSeconds" | "BuiltInTimezone" | "BuiltInTz" | "BuiltInNow" | "BuiltInUuid" | "BuiltInStruuid" | "BuiltInMd5" | "BuiltInSha1" | "BuiltInSha256" | "BuiltInSha384" | "BuiltInSha512" | "BuiltInCoalesce" | "BuiltInIf" | "BuiltInStrlang" | "BuiltInStrdt" | "BuiltInSameterm" | "BuiltInIsiri" | "BuiltInIsuri" | "BuiltInIsblank" | "BuiltInIsliteral" | "BuiltInIsnumeric" | "BuiltInRegex" | "BuiltInSubstr" | "BuiltInReplace" | "BuiltInExists" | "BuiltInNotexists" | "BuiltInCount" | "BuiltInSum" | "BuiltInMin" | "BuiltInMax" | "BuiltInAvg" | "BuiltInSample" | "BuiltInGroup_concat" | "NamedGraph" | "Graph" | "GraphAll" | "LCurly" | "RCurly" | "Dot" | "Comma" | "Semi" | "LParen" | "RParen" | "LSquare" | "RSquare" | "Pipe" | "Slash" | "Hat" | "Question" | "Star" | "OpPlus" | "OpMinus" | "Exclamation" | "LogicAnd" | "LogicOr" | "Equal" | "NotEqual" | "LessThan" | "GreaterThan" | "LessThanEqual" | "GreaterThanEqual" | "Hathat" | "IriRef" | "PNameLn" | "PNameNs" | "BlankNodeLabel" | "Var1" | "Var2" | "Integer" | "Decimal" | "Double" | "InterferePositive" | "DecimalPositive" | "DoublePositive" | "IntegerNegative" | "DecimalNegative" | "DoubleNegative" | "StringLiteral1" | "StringLiteral2" | "StringLiteralLong1" | "StringLiteralLong2" | "Ws" | "Comment" | "Nil" | "Anon" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "As" | "Construct" | "Describe" | "Ask" | "Where" | "GroupByGroup" | "By" | "Having" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Clear" | "Drop" | "Create" | "Add" | "To" | "Move" | "Copy" | "ModifyWith" | "DeleteClause" | "InsertClause" | "DataClause" | "UsingClause" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "a" | "True" | "False" | "In" | "NotIn" | "Separator" | "Version" | "Tilde" | "AnnotationOpen" | "AnnotationClose" | "ReificationOpen" | "ReificationClose" | "TripleTermOpen" | "TripleTermClose" | "BuiltInLangdir" | "BuiltInStrLangdir" | "BuiltInHasLang" | "BuiltInHasLangdir" | "BuiltInIsTriple" | "BuiltInTriple" | "BuiltInSubject" | "BuiltInPredicate" | "BuiltInObject" | "LANG_DIR">;
+export declare const sparql12LexerBuilder: LexerBuilder<"BuiltInStr" | "BuiltInLang" | "BuiltInLangmatches" | "BuiltInDatatype" | "BuiltInBound" | "BuiltInIri" | "BuiltInUri" | "BuiltInBnode" | "BuiltInRand" | "BuiltInAbs" | "BuiltInCeil" | "BuiltInFloor" | "BuiltInRound" | "BuiltInConcat" | "BuiltInStrlen" | "BuiltInUcase" | "BuiltInLcase" | "BuiltInEncode_for_uri" | "BuiltInContains" | "BuiltInStrstarts" | "BuiltInStrends" | "BuiltInStrbefore" | "BuiltInStrafter" | "BuiltInYear" | "BuiltInMonth" | "BuiltInDay" | "BuiltInHours" | "BuiltInMinutes" | "BuiltInSeconds" | "BuiltInTimezone" | "BuiltInTz" | "BuiltInNow" | "BuiltInUuid" | "BuiltInStruuid" | "BuiltInMd5" | "BuiltInSha1" | "BuiltInSha256" | "BuiltInSha384" | "BuiltInSha512" | "BuiltInCoalesce" | "BuiltInIf" | "BuiltInStrlang" | "BuiltInStrdt" | "BuiltInSameterm" | "BuiltInIsiri" | "BuiltInIsuri" | "BuiltInIsblank" | "BuiltInIsliteral" | "BuiltInIsnumeric" | "BuiltInRegex" | "BuiltInSubstr" | "BuiltInReplace" | "BuiltInSum" | "BuiltInMin" | "BuiltInMax" | "BuiltInAvg" | "BuiltInSample" | "BuiltInExists" | "BuiltInNotexists" | "Pipe" | "Slash" | "From" | "Clear" | "Drop" | "Add" | "Copy" | "Move" | "InsertClause" | "DataClause" | "DeleteClause" | "Where" | "UsingClause" | "BuiltInLangdir" | "BuiltInStrLangdir" | "BuiltInHasLang" | "BuiltInHasLangdir" | "BuiltInIsTriple" | "BuiltInTriple" | "BuiltInSubject" | "BuiltInPredicate" | "BuiltInObject" | "IriRef" | "PNameNs" | "PNameLn" | "BlankNodeLabel" | "Var1" | "Var2" | "Double" | "Decimal" | "Integer" | "InterferePositive" | "DecimalPositive" | "DoublePositive" | "IntegerNegative" | "DecimalNegative" | "DoubleNegative" | "StringLiteralLong1" | "StringLiteralLong2" | "StringLiteral1" | "StringLiteral2" | "Ws" | "Comment" | "Nil" | "Anon" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "Construct" | "Describe" | "Ask" | "Having" | "GroupByGroup" | "By" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Create" | "To" | "ModifyWith" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "As" | "a" | "True" | "False" | "In" | "NotIn" | "Separator" | "BuiltInCount" | "BuiltInGroup_concat" | "NamedGraph" | "DefaultGraph" | "Graph" | "GraphAll" | "LogicAnd" | "LogicOr" | "NotEqual" | "LessThanEqual" | "GreaterThanEqual" | "LCurly" | "RCurly" | "Dot" | "Comma" | "Semi" | "LParen" | "RParen" | "LSquare" | "RSquare" | "Hathat" | "Hat" | "Question" | "Star" | "OpPlus" | "OpMinus" | "Exclamation" | "Equal" | "LessThan" | "GreaterThan" | "Tilde" | "AnnotationOpen" | "AnnotationClose" | "TripleTermOpen" | "TripleTermClose" | "ReificationOpen" | "ReificationClose" | "Version" | "LANG_DIR">;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/rules-sparql-1-2",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Traqula Lexer and Grammar Rules for sparql 1.2",
   "lsd:module": true,
   "license": "MIT",
@@ -41,8 +41,8 @@
     "build:transpile": " node \"../../node_modules/esbuild/bin/esbuild\" --format=cjs --bundle --log-level=error --outfile=lib/index.cjs lib/index.ts"
   },
   "dependencies": {
-    "@traqula/core": "^0.0.7",
-    "@traqula/rules-sparql-1-1": "^0.0.7"
+    "@traqula/core": "^0.0.9",
+    "@traqula/rules-sparql-1-1": "^0.0.9"
   },
-  "gitHead": "c8d47c5a14075386821fe96e026cf61348a06258"
+  "gitHead": "c13cd255122c688daad98bf313a3397cbffdc45d"
 }