wesl 0.6.0-pre2

package/src/test/__snapshots__/ParseWESL2.test.ts.snap

@@ -0,0 +1,67 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`parse unicode ident 1`] = `
+"module
+  text '
+  '
+  fn Δέλτα()
+    text 'fn '
+    decl %Δέλτα
+    text '(){}'
+  text ' 
+  '
+  fn réflexion()
+    text 'fn '
+    decl %réflexion
+    text '(){}'
+  text ' 
+  '
+  fn Кызыл()
+    text 'fn '
+    decl %Кызыл
+    text '(){}'
+  text ' 
+  '
+  fn 𐰓𐰏𐰇()
+    text 'fn '
+    decl %𐰓𐰏𐰇
+    text '(){}'
+  text ' 
+  '
+  fn 朝焼け()
+    text 'fn '
+    decl %朝焼け
+    text '(){}'
+  text '
+  '
+  fn سلام()
+    text 'fn '
+    decl %سلام
+    text '(){}'
+  text ' 
+  '
+  fn 검정()
+    text 'fn '
+    decl %검정
+    text '(){}'
+  text ' 
+  '
+  fn שָׁלוֹם()
+    text 'fn '
+    decl %שָׁלוֹם
+    text '(){}'
+  text '
+  '
+  fn गुलाबी()
+    text 'fn '
+    decl %गुलाबी
+    text '(){}'
+  text '
+  '
+  fn փիրուզ()
+    text 'fn '
+    decl %փիրուզ
+    text '(){}'
+  text '
+  '"
+`;

package/src/test/__snapshots__/RustDirective.test.ts.snap

@@ -0,0 +1,359 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`import a 1`] = `
+[
+  {
+    "end": 8,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "a",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import a::* 1`] = `
+[
+  {
+    "end": 11,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "a",
+        },
+        Wildcard {
+          "wildcard": "*",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import a::{b, c}::* 1`] = `
+[
+  {
+    "end": 19,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "a",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "b",
+                },
+              ],
+            },
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "c",
+                },
+              ],
+            },
+          ],
+        },
+        Wildcard {
+          "wildcard": "*",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import a::b::c 1`] = `
+[
+  {
+    "end": 14,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "a",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "b",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "c",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import my::lighting::{ pbr }; 1`] = `
+[
+  {
+    "end": 29,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "my",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "lighting",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "pbr",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import my::lighting::{ pbr as lights } 1`] = `
+[
+  {
+    "end": 38,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "my",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "lighting",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": "lights",
+                  "name": "pbr",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import my::lighting::{ pbr, jelly }; 1`] = `
+[
+  {
+    "end": 36,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "my",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "lighting",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "pbr",
+                },
+              ],
+            },
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "jelly",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import my::lighting::{ pbr, jelly::jam }; 1`] = `
+[
+  {
+    "end": 41,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "my",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "lighting",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "pbr",
+                },
+              ],
+            },
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "jelly",
+                },
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "jam",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`import my::lighting::pbr; 1`] = `
+[
+  {
+    "end": 25,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "my",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "lighting",
+        },
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "pbr",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;
+
+exports[`multiline import 1`] = `
+[
+  {
+    "end": 29,
+    "imports": ImportTree {
+      "segments": [
+        SimpleSegment {
+          "args": undefined,
+          "as": undefined,
+          "name": "a",
+        },
+        SegmentList {
+          "list": [
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "b",
+                },
+              ],
+            },
+            ImportTree {
+              "segments": [
+                SimpleSegment {
+                  "args": undefined,
+                  "as": undefined,
+                  "name": "c",
+                },
+              ],
+            },
+          ],
+        },
+        Wildcard {
+          "wildcard": "*",
+        },
+      ],
+    },
+    "kind": "treeImport",
+    "start": 0,
+  },
+]
+`;

package/src/test/shared/StringUtil.ts

@@ -0,0 +1,59 @@
+import { expect } from "vitest";
+
+/** trim source for test comparisons
+ * rm blank lines
+ * rm leading indent consistently across remaining lines
+ * rm trailing spaces from each line */
+export function trimSrc(src: string): string {
+  const rawLines = src.split("\n");
+  const nonBlankLines = rawLines.filter(l => l.trim() !== "");
+  const indents = nonBlankLines.map(l => l.match(/^[ \t]*/)?.[0].length ?? 0);
+  if (indents.length === 0) return src;
+
+  const minIndent = indents.reduce((min, i) => Math.min(min, i));
+
+  const indentTrimmed = nonBlankLines.map(l => l.slice(minIndent));
+  const noTrailingSpaces = indentTrimmed.map(l => l.trimEnd());
+
+  return noTrailingSpaces.join("\n");
+}
+
+export function dropWhile<T>(a: T[], fn: (el: T) => boolean): T[] {
+  let skip = 0;
+  while (skip < a.length && fn(a[skip])) skip++;
+
+  return a.slice(skip);
+}
+
+export function dropRightWhile<T>(a: T[], fn: (el: T) => boolean): T[] {
+  let skip = a.length - 1;
+  while (skip >= 0 && fn(a[skip])) skip--;
+
+  return a.slice(0, skip + 1);
+}
+
+export function matchTrimmed(result: string, expected: string): void {
+  const resultTrimmed = trimSrc(result);
+  const expectTrimmed = trimSrc(expected);
+  if (resultTrimmed !== expectTrimmed) {
+    const expectLines = expectTrimmed.split("\n");
+    const resultLines = resultTrimmed.split("\n");
+    const len = Math.max(expectLines.length, resultLines.length);
+    for (let i = 0; i < len; i++) {
+      const diff = expectLines[i] !== resultLines[i];
+      if (diff) {
+        console.log(`...failed.  Line ${i + 1} differs:
+  expected: ${expectLines[i]}
+    actual: ${resultLines[i] ?? ""}`);
+        break;
+      }
+    }
+    console.log(
+      `\ntrimmed result:\n${resultTrimmed}\n\ntrimmed expected:\n${expectTrimmed}\n`,
+    );
+    // console.log(
+    //   `\nresult:\n${result}\n\nexpected:\n${expected}\n`,
+    // );
+  }
+  expect(resultTrimmed).toBe(expectTrimmed);
+}

package/src/test/shared/test/StringUtil.test.ts

@@ -0,0 +1,32 @@
+import { expect, test } from "vitest";
+import { trimSrc } from "../StringUtil.js";
+
+test("trimSrc on blank", () => {
+  const trimmed = trimSrc(``);
+  expect(trimmed).toBe("");
+});
+
+test("trimSrc with leading blank lines", () => {
+  const trimmed = trimSrc(`
+
+    fn foo() {
+      // bar
+    }`);
+  expect(trimmed).toBe("fn foo() {\n  // bar\n}");
+});
+
+test("trimSrc with blank line in the middle and at end", () => {
+  const trimmed = trimSrc(
+    `
+      foo
+
+      bar
+     `,
+  );
+  expect(trimmed).toBe("foo\nbar");
+});
+
+test("trimSrc with trailing spaces", () => {
+  const trimmed = trimSrc(` foo `);
+  expect(trimmed).toBe("foo");
+});

package/src/test/wgsl_1/main.wgsl

@@ -0,0 +1,3 @@
+import ./wgsl_1/util/bar;
+
+fn main() { bar(); }

package/src/test/wgsl_1/util.wgsl

@@ -0,0 +1 @@
+fn bar() { }

package/src/test/wgsl_2/main2.wgsl

@@ -0,0 +1,3 @@
+import ./wgsl_2/util2/bar
+
+fn main() { bar(); }

package/src/test/wgsl_2/util2.wgsl

@@ -0,0 +1 @@
+fn bar() { }