webpipe-js 2.0.67 → 2.0.69

package/dist/index.cjs

@@ -378,7 +378,7 @@ var Parser = class {
     if (bt !== null) return { config: bt, configType: "backtick" };
     const dq = this.tryParse(() => this.parseQuotedString());
     if (dq !== null) return { config: dq, configType: "quoted" };
-    const id = this.tryParse(() => this.parseIdentifier());
+    const id = this.tryParse(() => this.parseScopedIdentifier());
     if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
@@ -1366,10 +1366,21 @@ var Parser = class {
     if (this.text.startsWith("query ", this.pos) || this.text.startsWith("mutation ", this.pos)) {
       const type = this.consumeWhile((c) => c !== " ");
       this.skipInlineSpaces();
-      const name = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const name = this.parseScopedIdentifier();
       target = `${type}.${name}`;
+    } else if (this.text.startsWith("pipeline ", this.pos)) {
+      this.pos += 9;
+      const name = this.parseScopedIdentifier();
+      target = `pipeline.${name}`;
     } else {
-      target = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const middlewareType = this.parseIdentifier();
+      if (this.cur() === ".") {
+        this.pos++;
+        const varName = this.parseScopedIdentifier();
+        target = `${middlewareType}.${varName}`;
+      } else {
+        target = middlewareType;
+      }
     }
     this.skipInlineSpaces();
     this.expect("returning");

package/dist/index.mjs

@@ -324,7 +324,7 @@ var Parser = class {
     if (bt !== null) return { config: bt, configType: "backtick" };
     const dq = this.tryParse(() => this.parseQuotedString());
     if (dq !== null) return { config: dq, configType: "quoted" };
-    const id = this.tryParse(() => this.parseIdentifier());
+    const id = this.tryParse(() => this.parseScopedIdentifier());
     if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
@@ -1312,10 +1312,21 @@ var Parser = class {
     if (this.text.startsWith("query ", this.pos) || this.text.startsWith("mutation ", this.pos)) {
       const type = this.consumeWhile((c) => c !== " ");
       this.skipInlineSpaces();
-      const name = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const name = this.parseScopedIdentifier();
       target = `${type}.${name}`;
+    } else if (this.text.startsWith("pipeline ", this.pos)) {
+      this.pos += 9;
+      const name = this.parseScopedIdentifier();
+      target = `pipeline.${name}`;
     } else {
-      target = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const middlewareType = this.parseIdentifier();
+      if (this.cur() === ".") {
+        this.pos++;
+        const varName = this.parseScopedIdentifier();
+        target = `${middlewareType}.${varName}`;
+      } else {
+        target = middlewareType;
+      }
     }
     this.skipInlineSpaces();
     this.expect("returning");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpipe-js",
-  "version": "2.0.67",
+  "version": "2.0.69",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",