packages/lang-jsonc/package.json

@@ -32,9 +32,9 @@
     "@lezer/lr": "^1.3.7"
   },
   "scripts": {
-    "build": "yarn build:esm && yarn build:umd",
+    "build": "yarn build:ts",
     "build:ci": "yarn build",
-    "build:ts": "true",
+    "build:ts": "yarn build:esm && yarn build:umd",
     "build:esm": "tsc -b tsconfig.json",
     "build:umd": "tsc -b tsconfig.umd.json",
     "prebuild:esm": "yarn generate",

packages/lang-jsonc/src/test/arrays.txt

@@ -0,0 +1,34 @@
+# Empty Array
+
+[ ]
+
+==>
+
+JsoncText(Array)
+
+# Array With One Value
+
+["One is the loneliest number"]
+
+==>
+
+JsoncText(Array(String))
+
+# Array With Multiple Values
+
+[
+  "The more the merrier",
+  1e5,
+  true,
+  { },
+  ["I'm", "nested"]
+]
+
+==>
+
+JsoncText(Array(
+  String,
+  Number,
+  True,
+  Object,
+  Array(String,String)))

packages/lang-jsonc/src/test/comments.txt

@@ -0,0 +1,33 @@
+# Line Comment
+
+{
+    // FIXME
+}
+
+==>
+
+JsoncText(Object("{",LineComment,"}"))
+
+# Block Comment
+
+{
+    /* I am a big old
+
+
+    "comment
+    */
+}
+
+==>
+
+JsoncText(Object("{",BlockComment,"}"))
+
+# Line comment as "string"
+
+{
+    // This is a "comment"
+}
+
+==>
+
+JsoncText(Object("{",LineComment,"}"))

packages/lang-jsonc/src/test/literals.txt

@@ -0,0 +1,23 @@
+# True
+
+true
+
+==>
+
+JsoncText(True)
+
+# False
+
+false
+
+==>
+
+JsoncText(False)
+
+# Null
+
+null
+
+==>
+
+JsoncText(Null)

packages/lang-jsonc/src/test/numbers.txt

@@ -0,0 +1,87 @@
+# Simple Integer
+
+42
+
+==>
+
+JsoncText(Number)
+
+# Zero By Itself Is Ok
+
+0
+
+==>
+
+JsoncText(Number)
+
+# Leading Zeros Aren't Ok
+
+[0123]
+
+==>
+
+JsoncText(Array(Number, ⚠(Number)))
+
+# Optional Minus Sign
+
+-53
+
+==>
+
+JsoncText(Number)
+
+# Decimal Digits
+
+123.4
+
+==>
+
+JsoncText(Number)
+
+# Must Have Digits After Decimal
+
+123.
+
+==>
+
+JsoncText(Number, ⚠)
+
+# Exponent: Lowercase e
+
+1e5
+
+==>
+
+JsoncText(Number)
+
+# Exponent: Uppercase E
+
+1E5
+
+==>
+
+JsoncText(Number)
+
+# Exponent: Optional Plus Sign
+
+1e+5
+
+==>
+
+JsoncText(Number)
+
+# Exponent: Optional Minus Sign
+
+1E-5
+
+==>
+
+JsoncText(Number)
+
+# Exponent Without Digit Is Not Ok
+
+42e
+
+==>
+
+JsoncText(Number, ⚠)

packages/lang-jsonc/src/test/objects.txt

@@ -0,0 +1,49 @@
+# Empty Object
+
+{ }
+
+==>
+
+JsoncText(Object)
+
+# One Property
+
+{
+  "foo": 123
+}
+
+==>
+
+JsoncText(Object(Property(PropertyName,Number)))
+
+# Multiple Properties
+
+{
+  "foo": 123,
+  "bar": "I'm a bar!",
+  "obj": {},
+  "arr": [1, 2, 3]
+}
+
+==>
+
+JsoncText(Object(
+  Property(PropertyName,Number),
+  Property(PropertyName,String),
+  Property(PropertyName,Object),
+  Property(PropertyName,Array(Number,Number,Number))))
+
+# Trailing Commas
+
+{
+  "obj": {"key": 1,},
+  "arr": [1, 2, 3,],
+}
+
+==>
+
+JsoncText(Object(
+  Property(PropertyName,Object(
+    Property(PropertyName, Number)
+  )),
+  Property(PropertyName,Array(Number,Number,Number))))

packages/lang-jsonc/src/test/strings.txt

@@ -0,0 +1,31 @@
+# Empty String
+
+""
+
+==>
+
+JsoncText(String)
+
+# Non-empty String
+
+"This is a boring old string"
+
+==>
+
+JsoncText(String)
+
+# All The Valid One-Character Escapes
+
+"\"\\\/\b\f\n\rt\t"
+
+==>
+
+JsoncText(String)
+
+# Unicode Escape
+
+"\u005C"
+
+==>
+
+JsoncText(String)

packages/lang-jsonc/src/test/test-jsonc.spec.js

@@ -0,0 +1,18 @@
+import { describe, it } from 'vitest';
+import { parser } from '../parser';
+import { fileTests } from '@lezer/generator/dist/test';
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+let caseDir = path.dirname(fileURLToPath(import.meta.url));
+
+for (let file of fs.readdirSync(caseDir)) {
+  if (!/\.txt$/.test(file)) continue;
+
+  let name = /^[^\.]*/.exec(file)[0];
+  describe(name, () => {
+    for (let { name, run } of fileTests(fs.readFileSync(path.join(caseDir, file), 'utf8'), file))
+      it(name, () => run(parser));
+  });
+}

packages/liquid-html-parser/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @shopify/liquid-html-parser
 
+## 2.0.5
+
+### Patch Changes
+
+- c664d52: LiquidBranch nodes should always report a blockEndPosition of 0 length
+
 ## 2.0.4
 
 ### Patch Changes

packages/liquid-html-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/liquid-html-parser",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Liquid HTML parser by Shopify",
   "author": "CP Clermont <cp.clermont@shopify.com>",
   "homepage": "https://github.com/Shopify/theme-tools/tree/main/packages/liquid-html-parser#readme",

packages/liquid-html-parser/src/stage-2-ast.spec.ts

@@ -681,6 +681,12 @@ describe('Unit: Stage 2 (AST)', () => {
         expectPath(ast, 'children.0.children.0.blockStartPosition.end').to.equal(
           source.indexOf(branchA),
         );
+        expectPath(ast, 'children.0.children.0.blockEndPosition.start').to.equal(
+          source.indexOf('{% elsif b %}'),
+        );
+        expectPath(ast, 'children.0.children.0.blockEndPosition.end').to.equal(
+          source.indexOf('{% elsif b %}'),
+        );
 
         expectPath(ast, 'children.0.children.1.type').to.equal('LiquidBranch');
         expectPath(ast, 'children.0.children.1.position.start').to.equal(
@@ -695,6 +701,12 @@ describe('Unit: Stage 2 (AST)', () => {
         expectPath(ast, 'children.0.children.1.blockStartPosition.end').to.equal(
           source.indexOf('{% elsif b %}') + '{% elsif b %}'.length,
         );
+        expectPath(ast, 'children.0.children.1.blockEndPosition.start').to.equal(
+          source.indexOf('{% else %}'),
+        );
+        expectPath(ast, 'children.0.children.1.blockEndPosition.end').to.equal(
+          source.indexOf('{% else %}'),
+        );
 
         expectPath(ast, 'children.0.children.2.type').to.equal('LiquidBranch');
         expectPath(ast, 'children.0.children.2.position.start').to.equal(
@@ -709,6 +721,12 @@ describe('Unit: Stage 2 (AST)', () => {
         expectPath(ast, 'children.0.children.2.blockStartPosition.end').to.equal(
           source.indexOf('{% else %}') + '{% else %}'.length,
         );
+        expectPath(ast, 'children.0.children.2.blockEndPosition.start').to.equal(
+          source.indexOf('{% endif %}', source.indexOf(branchC) + branchC.length),
+        );
+        expectPath(ast, 'children.0.children.2.blockEndPosition.end').to.equal(
+          source.indexOf('{% endif %}', source.indexOf(branchC) + branchC.length),
+        );
       }
     });