@traqula/rules-sparql-1-2 0.0.20 → 0.0.21

package/lib/grammar.d.ts

@@ -57,12 +57,12 @@ export declare const triplesSameSubjectPath: SparqlGrammarRule<"triplesSameSubje
  * OVERRIDING RULE: {@link S11.object}.
  * [[86]](https://www.w3.org/TR/sparql12-query/#rObject) Used by ObjectList
  */
-export declare const object: SparqlGrammarRule<"object", TripleNesting, [GraphNode, T11.TermIriFull | T11.TermIriPrefixed | T11.TermVariable | T11.PropertyPathChain | T11.PathModified | T11.PathNegated]>;
+export declare const object: SparqlGrammarRule<"object", TripleNesting, [GraphNode, T11.TermIriFull | T11.TermIriPrefixed | T11.TermVariable | T11.PathNegated | T11.PathModified | T11.PropertyPathChain]>;
 /**
  * OVERRIDING RULE: {@link S11.objectPath}.
  * [[87]](https://www.w3.org/TR/sparql12-query/#rTriplesSameSubjectPath) Used by ObjectListPath
  */
-export declare const objectPath: SparqlGrammarRule<"objectPath", TripleNesting, [GraphNode, T11.TermIriFull | T11.TermIriPrefixed | T11.TermVariable | T11.PropertyPathChain | T11.PathModified | T11.PathNegated]>;
+export declare const objectPath: SparqlGrammarRule<"objectPath", TripleNesting, [GraphNode, T11.TermIriFull | T11.TermIriPrefixed | T11.TermVariable | T11.PathNegated | T11.PathModified | T11.PropertyPathChain]>;
 /**
  * [[109]](https://www.w3.org/TR/sparql12-query/#rAnnotationPath)
  */

package/lib/index.cjs

@@ -9526,7 +9526,7 @@ var LexerBuilder = class _LexerBuilder {
 };
 
 // ../core/lib/TransformerObject.js
-var TransformerObject = class {
+var TransformerObject = class _TransformerObject {
   defaultContext;
   maxStackSize = 1e6;
   /**
@@ -9536,12 +9536,15 @@ var TransformerObject = class {
   constructor(defaultContext = {}) {
     this.defaultContext = defaultContext;
   }
+  clone(newDefaultContext = {}) {
+    return new _TransformerObject({ ...this.defaultContext, ...newDefaultContext });
+  }
   /**
    * Function to shallow clone any type.
    * @param obj
    * @protected
    */
-  clone(obj) {
+  cloneObj(obj) {
     if (obj === null || typeof obj !== "object") {
       return obj;
     }
@@ -9616,7 +9619,7 @@ var TransformerObject = class {
         const ignoreKeys = context.ignoreKeys ?? defaultIgnoreKeys;
         const shallowKeys = context.shallowKeys ?? defaultShallowKeys;
         didShortCut = context.shortcut ?? defaultDidShortCut;
-        const copy3 = copyFlag ? this.clone(curObject) : curObject;
+        const copy3 = copyFlag ? this.cloneObj(curObject) : curObject;
         handleMapperOnLen.push(stack.length);
         mapperCopyStack.push(copy3);
         mapperOrigStack.push(curObject);
@@ -9630,7 +9633,7 @@ var TransformerObject = class {
             const val = copy3[key];
             const onlyShallow = shallowKeys && shallowKeys?.has(key);
             if (onlyShallow) {
-              copy3[key] = this.clone(val);
+              copy3[key] = this.cloneObj(val);
             }
             if (ignoreKeys && ignoreKeys.has(key)) {
               continue;
@@ -9711,12 +9714,15 @@ var TransformerObject = class {
 };
 
 // ../core/lib/TransformerTyped.js
-var TransformerTyped = class extends TransformerObject {
+var TransformerTyped = class _TransformerTyped extends TransformerObject {
   defaultNodePreVisitor;
   constructor(defaultContext = {}, defaultNodePreVisitor = {}) {
     super(defaultContext);
     this.defaultNodePreVisitor = defaultNodePreVisitor;
   }
+  clone(newDefaultContext = {}, newDefaultNodePreVisitor = {}) {
+    return new _TransformerTyped({ ...this.defaultContext, ...newDefaultContext }, { ...this.defaultNodePreVisitor, ...newDefaultNodePreVisitor });
+  }
   /**
    * Transform a single node.
    * The transformation calls the preVisitor from starting from the startObject.
@@ -9805,10 +9811,13 @@ var TransformerTyped = class extends TransformerObject {
 };
 
 // ../core/lib/TransformerSubTyped.js
-var TransformerSubTyped = class extends TransformerTyped {
+var TransformerSubTyped = class _TransformerSubTyped extends TransformerTyped {
   constructor(defaultContext = {}, defaultNodePreVisitor = {}) {
     super(defaultContext, defaultNodePreVisitor);
   }
+  clone(newDefaultContext = {}, newDefaultNodePreVisitor = {}) {
+    return new _TransformerSubTyped({ ...this.defaultContext, ...newDefaultContext }, { ...this.defaultNodePreVisitor, ...newDefaultNodePreVisitor });
+  }
   /**
    * Shares the functionality and first two arguments with {@link this.transformNode}.
    * The third argument allows you to also transform based on the subType of objects.
@@ -11559,8 +11568,7 @@ function findPatternBoundedVars(iter, boundedVars) {
       optional: (op) => ({ next: op.patterns }),
       service: (op) => ({ next: [op.name, ...op.patterns] }),
       bind: (op) => ({ next: [op.variable] }),
-      graph: (op) => ({ next: [op.name, ...op.patterns] }),
-      minus: (op) => ({ next: op.patterns.slice(0, 1) })
+      graph: (op) => ({ next: [op.name, ...op.patterns] })
     },
     term: {
       variable: (op) => {

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<"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" | "DefaultGraph" | "Graph" | "GraphAll" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "As" | "Construct" | "Describe" | "Ask" | "From" | "Where" | "GroupByGroup" | "By" | "Having" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Clear" | "Drop" | "Create" | "Add" | "To" | "Move" | "Copy" | "ModifyWith" | "DeleteDataClause" | "DeleteWhereClause" | "DeleteClause" | "InsertDataClause" | "InsertClause" | "UsingClause" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "a" | "True" | "False" | "In" | "NotIn" | "Separator" | "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" | "Version" | "Tilde" | "AnnotationOpen" | "AnnotationClose" | "ReificationOpen" | "ReificationClose" | "TripleTermOpen" | "TripleTermClose" | "BuiltInLangdir" | "BuiltInStrLangdir" | "BuiltInHasLang" | "BuiltInHasLangdir" | "BuiltInIsTriple" | "BuiltInTriple" | "BuiltInSubject" | "BuiltInPredicate" | "BuiltInObject" | "LANG_DIR">;
+export declare const sparql12LexerBuilder: LexerBuilder<"StringLiteral1" | "StringLiteral2" | "BuiltInLangdir" | "BuiltInStrLangdir" | "BuiltInHasLang" | "BuiltInHasLangdir" | "BuiltInIsTriple" | "BuiltInTriple" | "BuiltInSubject" | "BuiltInPredicate" | "BuiltInObject" | "OpPlus" | "OpMinus" | "Version" | "Tilde" | "AnnotationOpen" | "AnnotationClose" | "Nil" | "ReificationOpen" | "ReificationClose" | "TripleTermOpen" | "TripleTermClose" | "a" | "LANG_DIR" | "Hathat" | "Exclamation" | "IriRef" | "PNameNs" | "PNameLn" | "BlankNodeLabel" | "Var1" | "Var2" | "Double" | "Decimal" | "Integer" | "InterferePositive" | "DecimalPositive" | "DoublePositive" | "IntegerNegative" | "DecimalNegative" | "DoubleNegative" | "StringLiteralLong1" | "StringLiteralLong2" | "Ws" | "Comment" | "Anon" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "Construct" | "Describe" | "Ask" | "From" | "Where" | "Having" | "GroupByGroup" | "By" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Clear" | "Drop" | "Create" | "Add" | "To" | "Move" | "Copy" | "ModifyWith" | "DeleteWhereClause" | "DeleteDataClause" | "DeleteClause" | "InsertDataClause" | "InsertClause" | "UsingClause" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "As" | "True" | "False" | "In" | "NotIn" | "Separator" | "BuiltInLangmatches" | "BuiltInDatatype" | "BuiltInLang" | "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" | "BuiltInStr" | "NamedGraph" | "DefaultGraph" | "Graph" | "GraphAll" | "LogicAnd" | "LogicOr" | "NotEqual" | "LessThanEqual" | "GreaterThanEqual" | "LCurly" | "RCurly" | "Dot" | "Comma" | "Semi" | "LParen" | "RParen" | "LSquare" | "RSquare" | "Pipe" | "Slash" | "Hat" | "Question" | "Star" | "Equal" | "LessThan" | "GreaterThan">;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/rules-sparql-1-2",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Traqula Lexer and Grammar Rules for sparql 1.2",
   "lsd:module": true,
   "license": "MIT",
@@ -42,8 +42,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.20",
-    "@traqula/rules-sparql-1-1": "^0.0.20"
+    "@traqula/core": "^0.0.21",
+    "@traqula/rules-sparql-1-1": "^0.0.21"
   },
-  "gitHead": "caf35c28d4ddbfec5947566b697d34f38c1e6e31"
+  "gitHead": "6e27b4bab942e473c11576196320bd52894ea5a4"
 }