babel · nicolo-ribaudo · Jun 2, 2021 · Apr 8, 2021 · Apr 8, 2021 · Apr 8, 2021
diff --git a/packages/babel-generator/src/generators/types.ts b/packages/babel-generator/src/generators/types.ts
@@ -236,6 +236,23 @@ export function DecimalLiteral(this: Printer, node: t.DecimalLiteral) {
   this.word(node.value + "m");
 }
 
+// Hack pipe operator
+export function TopicReference(this: Printer) {
+  const { topicToken } = this.format;
+  switch (topicToken) {
+    case "#":
+      this.token("#");
+      break;
+
+    default: {
+      const givenTopicTokenJSON = JSON.stringify(topicToken);
+      const message = `The "topicToken" generator option must be "#" (${givenTopicTokenJSON} received instead).`;
+      throw new Error(message);
+    }
+  }
+}
+
+// Smart-mix pipe operator
 export function PipelineTopicExpression(
   this: Printer,
   node: t.PipelineTopicExpression,

diff --git a/packages/babel-generator/src/index.ts b/packages/babel-generator/src/index.ts
@@ -62,6 +62,7 @@ function normalizeOptions(code, opts): Format {
       ...opts.jsescOption,
     },
     recordAndTupleSyntaxType: opts.recordAndTupleSyntaxType,
+    topicToken: opts.topicToken,
   };
 
   if (!process.env.BABEL_8_BREAKING) {
@@ -197,6 +198,12 @@ export interface GeneratorOptions {
      */
     wrap?: boolean;
   };
+
+  /**
+   * For use with the Hack-style pipe operator.
+   * Changes what token is used for pipe bodies’ topic references.
+   */
+  topicToken?: "#";
 }
 
 export interface GeneratorResult {

diff --git a/packages/babel-generator/src/printer.ts b/packages/babel-generator/src/printer.ts
@@ -29,6 +29,11 @@ export type Format = {
   recordAndTupleSyntaxType: "bar" | "hash";
   jsescOption;
   jsonCompatibleStrings?;
+  /**
+   * For use with the Hack-style pipe operator.
+   * Changes what token is used for pipe bodies’ topic references.
+   */
+  topicToken?: "#";
 };
 
 class Printer {

diff --git a/packages/babel-generator/test/fixtures/types/PipelineBareFunction/options.json b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
 }
diff --git a/packages/babel-generator/test/fixtures/types/PipelinePrimaryTopicReference/input.js b/packages/babel-generator/test/fixtures/types/PipelinePrimaryTopicReference/input.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/...on-calls,-chained,-multiline/options.json → ...ipelinePrimaryTopicReference/options.json b/...on-calls,-chained,-multiline/options.json → ...ipelinePrimaryTopicReference/options.json
diff --git a/packages/babel-generator/test/fixtures/types/PipelinePrimaryTopicReference/output.js b/packages/babel-generator/test/fixtures/types/PipelinePrimaryTopicReference/output.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/packages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/input.js b/packages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/input.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/...ages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/options.json b/...ages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "hack", "topicToken": "#" }]],
+  "topicToken": "#"
+}
diff --git a/packages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/output.js b/packages/babel-generator/test/fixtures/types/TopicReference-with-hash-topicToken/output.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/packages/babel-generator/test/fixtures/types/TopicReference-with-invalid-topicToken/input.js b/packages/babel-generator/test/fixtures/types/TopicReference-with-invalid-topicToken/input.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/...s/babel-generator/test/fixtures/types/TopicReference-with-invalid-topicToken/options.json b/...s/babel-generator/test/fixtures/types/TopicReference-with-invalid-topicToken/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "hack", "topicToken": "#" }]],
+  "topicToken": "invalid",
+  "throws": "The \"topicToken\" generator option must be \"#\" (\"invalid\" received instead)."
+}
diff --git a/packages/babel-generator/test/fixtures/types/TopicReference-with-missing-topicToken/input.js b/packages/babel-generator/test/fixtures/types/TopicReference-with-missing-topicToken/input.js
@@ -0,0 +1 @@
+2 + 3 |> #.toString(16);
diff --git a/...s/babel-generator/test/fixtures/types/TopicReference-with-missing-topicToken/options.json b/...s/babel-generator/test/fixtures/types/TopicReference-with-missing-topicToken/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "hack", "topicToken": "#" }]],
+  "throws": "The \"topicToken\" generator option must be \"#\" (undefined received instead)."
+}
diff --git a/packages/babel-parser/ast/spec.md b/packages/babel-parser/ast/spec.md
@@ -960,54 +960,6 @@ interface BindExpression <: Expression {
 
 If `object` is `null`, then `callee` should be a `MemberExpression`.
 
-### Pipeline
-
-These nodes are used by the Smart Pipeline to determine the type of the expression in a Pipeline Operator Expression. The F# Pipeline uses simple `BinaryExpression`s.
-
-#### PipelineBody
-
-```js
-interface PipelineBody <: NodeBase {
-    type: "PipelineBody";
-}
-```
-
-#### PipelineBareFunctionBody
-
-```js
-interface PipelineBody <: NodeBase {
-    type: "PipelineBareFunctionBody";
-    callee: Expression;
-}
-```
-
-#### PipelineBareConstructorBody
-
-```js
-interface PipelineBareConstructorBody <: NodeBase {
-    type: "PipelineBareConstructorBody";
-    callee: Expression;
-}
-```
-
-#### PipelineBareAwaitedFunctionBody
-
-```js
-interface PipelineBareConstructorBody <: NodeBase {
-    type: "PipelineTopicBody";
-    expression: Expression;
-}
-```
-
-#### PipelineTopicBody
-
-```js
-interface PipelineBareConstructorBody <: NodeBase {
-    type: "PipelineBareAwaitedFunctionBody";
-    callee: Expression;
-}
-```
-
 ## ConditionalExpression
 
 ```js
@@ -1099,6 +1051,17 @@ interface ModuleExpression <: Expression {
 
 A inline module expression proposed in https://github.com/tc39/proposal-js-module-blocks.
 
+## TopicReference
+
+```js
+interface TopicReference <: Expression {
+  type: "TopicReference";
+}
+```
+
+A topic reference to be used inside the body of
+a [Hack-style pipe expression](https://github.com/js-choi/proposal-hack-pipes).
+
 # Template Literals
 
 ## TemplateLiteral
@@ -1431,3 +1394,53 @@ interface ExportAllDeclaration <: ModuleDeclaration {
 ```
 
 An export batch declaration, e.g., `export * from "mod";`.
+
+### Smart-mix pipelines
+
+These types are **deprecated**.
+They are used by the deprecated smart-mix pipe operator to determine
+the type of a pipe expression's the body expression.
+The Hack and F# pipe operators use simple `BinaryExpression`s.
+
+#### PipelineBody
+
+```js
+interface PipelineBody <: NodeBase {
+    type: "PipelineBody";
+}
+```
+
+#### PipelineBareFunctionBody
+
+```js
+interface PipelineBody <: NodeBase {
+    type: "PipelineBareFunctionBody";
+    callee: Expression;
+}
+```
+
+#### PipelineBareConstructorBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineBareConstructorBody";
+    callee: Expression;
+}
+```
+
+#### PipelineBareAwaitedFunctionBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineTopicBody";
+    expression: Expression;
+}
+```
+
+#### PipelineTopicBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineBareAwaitedFunctionBody";
+    callee: Expression;
+}
diff --git a/packages/babel-parser/src/parser/error-message.js b/packages/babel-parser/src/parser/error-message.js
@@ -134,6 +134,20 @@ export const ErrorMessages = makeErrorTemplates(
     ParamDupe: "Argument name clash.",
     PatternHasAccessor: "Object pattern can't contain getter or setter.",
     PatternHasMethod: "Object pattern can't contain methods.",
+    PipeBodyIsTighter:
+      "Unexpected %0 after pipeline body; any %0 expression acting as Hack-style pipe body must be parenthesized due to its loose operator precedence.",
+
+    PipeTopicRequiresHackPipes:
+      'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.',
+    PipeTopicUnbound:
+      "Topic reference is unbound; it must be inside a Hack-style pipe body.",
+    PipeTopicUnused:
+      "Hack-style pipe body does not contain a topic reference; Hack-style pipes must use topic at least once.",
+
+    // Messages whose codes start with “Pipeline” or “PrimaryTopic”
+    // are retained for backwards compatibility
+    // with the deprecated smart-mix pipe operator proposal plugin.
+    // They are subject to removal in a future major version.
     PipelineBodyNoArrow:
       'Unexpected arrow "=>" after pipeline body; arrow function in pipeline body must be parenthesized.',
     PipelineBodySequenceExpression:
@@ -145,7 +159,8 @@ export const ErrorMessages = makeErrorTemplates(
     PrimaryTopicNotAllowed:
       "Topic reference was used in a lexical context without topic binding.",
     PrimaryTopicRequiresSmartPipeline:
-      "Primary Topic Reference found but pipelineOperator not passed 'smart' for 'proposal' option.",
+      'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.',
+
     PrivateInExpectedIn:
       "Private names are only allowed in property accesses (`obj.#%0`) or in `in` expressions (`#%0 in obj`).",
     PrivateNameRedeclaration: "Duplicate private name #%0.",