wesl 0.6.2 → 0.6.7

package/dist/index.js

@@ -437,7 +437,7 @@ function parserArg(arg) {
 function fn(fn2) {
   const parser2 = new Parser({
     fn: function _fn(state) {
-      let generatedParser = fn2();
+      const generatedParser = fn2();
       if (!fn2) {
         const before = state.stream.checkpoint();
         throw new ParseError(`fn parser called before definition`, [
@@ -1117,13 +1117,13 @@ function mapValues(obj, fn2) {
   return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, fn2(v)]));
 }
 function offsetToLineNumber(offset, text2) {
-  offset = Math.min(text2.length, Math.max(0, offset));
+  const safeOffset = Math.min(text2.length, Math.max(0, offset));
   let lineStartOffset = 0;
   let lineNum = 1;
   while (true) {
     const lineEnd = text2.indexOf("\n", lineStartOffset);
-    if (lineEnd === -1 || offset <= lineEnd) {
-      const linePos = 1 + (offset - lineStartOffset);
+    if (lineEnd === -1 || safeOffset <= lineEnd) {
+      const linePos = 1 + (safeOffset - lineStartOffset);
       return [lineNum, linePos];
     } else {
       lineStartOffset = lineEnd + 1;
@@ -1173,19 +1173,20 @@ function encodeVlq(value) {
 }
 function encode_integer(num) {
   let result = "";
+  let enc;
   if (num < 0) {
-    num = -num << 1 | 1;
+    enc = -num << 1 | 1;
   } else {
-    num <<= 1;
+    enc = num << 1;
   }
   do {
-    let clamped = num & 31;
-    num >>>= 5;
-    if (num > 0) {
+    let clamped = enc & 31;
+    enc >>>= 5;
+    if (enc > 0) {
       clamped |= 32;
     }
     result += integer_to_char[clamped];
-  } while (num > 0);
+  } while (enc > 0);
   return result;
 }
 function throwClickableError(params) {
@@ -1889,7 +1890,7 @@ const memberRefCollect = collectElem(
   }
 );
 function nameCollect(cc) {
-  const { start, end, src, app } = cc;
+  const { start, end, src } = cc;
   const name2 = src.slice(start, end);
   const elem = { kind: "name", start, end, name: name2 };
   addToOpenElem(cc, elem);
@@ -2109,6 +2110,7 @@ const weslMatcher = new RegexMatchers({
   blankspaces,
   commentStart,
   symbol: matchOneOf(symbolSet),
+  // biome-ignore lint/correctness/noEmptyCharacterClassInRegex: TODO
   invalid: /[^]/
 });
 function weslExtension(combinator) {
@@ -2162,7 +2164,8 @@ class WeslStream {
       return this.eolPattern.lastIndex;
     }
   }
-  skipBlockComment(position) {
+  skipBlockComment(start) {
+    let position = start;
     while (true) {
       this.blockCommentPattern.lastIndex = position;
       const result = this.blockCommentPattern.exec(this.src);
@@ -2552,10 +2555,7 @@ const struct_member = tagScope(
   ).collect(collectStructMember)
 ).ctag("members");
 const struct_decl = seq(
-  weslExtension(opt_attributes).collect(
-    (cc) => cc.tags.attribute,
-    "attributes"
-  ),
+  weslExtension(opt_attributes).collect((cc) => cc.tags.attribute, "attributes"),
   "struct",
   req(globalTypeNameDecl, "invalid struct, expected name"),
   seq(
@@ -2860,10 +2860,7 @@ const global_value_decl = or(
   ).collect(collectVarLike("const"))
 ).collect(partialScopeCollect);
 const global_alias = seq(
-  weslExtension(opt_attributes).collect(
-    (cc) => cc.tags.attribute,
-    "attributes"
-  ),
+  weslExtension(opt_attributes).collect((cc) => cc.tags.attribute, "attributes"),
   "alias",
   req(word, "invalid alias, expected name").collect(
     globalDeclCollect,
@@ -3039,7 +3036,7 @@ class WeslParseError extends Error {
     this.src = opts.src;
   }
 }
-function parseSrcModule(srcModule, srcMap) {
+function parseSrcModule(srcModule) {
   const stream = new WeslStream(srcModule.src);
   const appState = blankWeslParseState(srcModule);
   const init = { stream, appState };
@@ -3210,7 +3207,7 @@ function findUnboundIdents(registry) {
     unbound: [],
     dontFollowDecls: true
   };
-  Object.entries(registry.modules).map(([module, ast]) => {
+  Object.entries(registry.modules).map(([_module, ast]) => {
     const rootDecls = findValidRootDecls(ast.rootScope, {});
     const declEntries = rootDecls.map((d) => [d.originalName, d]);
     const liveDecls = { decls: new Map(declEntries), parent: null };
@@ -3551,9 +3548,7 @@ function emitAttributes(attributes, ctx) {
 function emitStruct(e, ctx) {
   const { name: name2, members, start, end } = e;
   const { srcBuilder } = ctx;
-  const validMembers = members.filter(
-    (m) => conditionsValid(m, ctx.conditions)
-  );
+  const validMembers = members.filter((m) => conditionsValid(m, ctx.conditions));
   const validLength = validMembers.length;
   if (validLength === 0) {
     warnEmptyStruct(e);
@@ -4147,15 +4142,16 @@ function selectModule(parsed, selectPath, packageName = "package") {
   return parsed.modules[modulePath];
 }
 function parseIntoRegistry(srcFiles, registry, packageName = "package", debugWeslRoot) {
-  if (debugWeslRoot === void 0) {
-    debugWeslRoot = "";
-  } else if (!debugWeslRoot.endsWith("/")) {
-    debugWeslRoot += "/";
+  let weslRoot2 = debugWeslRoot;
+  if (weslRoot2 === void 0) {
+    weslRoot2 = "";
+  } else if (!weslRoot2.endsWith("/")) {
+    weslRoot2 += "/";
   }
   const srcModules = Object.entries(srcFiles).map(
     ([filePath, src]) => {
       const modulePath = fileToModulePath(filePath, packageName);
-      return { modulePath, debugFilePath: debugWeslRoot + filePath, src };
+      return { modulePath, debugFilePath: weslRoot2 + filePath, src };
     }
   );
   srcModules.forEach((mod) => {
@@ -4424,7 +4420,7 @@ function transformBindingStruct(s, globalNames) {
     member.mangledVarName = varName;
     globalNames.add(varName);
     const attributes = ((_a = member.attributes) == null ? void 0 : _a.map(attributeToString).join(" ")) ?? "";
-    const varTypes = lowerPtrMember(member, typeName, typeParameters) ?? lowerStdTypeMember(typeName, typeParameters) ?? lowerStorageTextureMember(typeName, typeParameters);
+    const varTypes = lowerPtrMember(typeName, typeParameters) ?? lowerStdTypeMember(typeName, typeParameters) ?? lowerStorageTextureMember(typeName, typeParameters);
     if (!varTypes) {
       console.log("unhandled case transforming member", typeName);
       return syntheticVar(attributes, varName, "", "??");
@@ -4433,7 +4429,7 @@ function transformBindingStruct(s, globalNames) {
     return syntheticVar(attributes, varName, storageType, varType);
   });
 }
-function lowerPtrMember(member, typeName, typeParameters, varName) {
+function lowerPtrMember(typeName, typeParameters) {
   if (typeName.originalName === "ptr") {
     const origParams = typeParameters ?? [];
     const newParams = [origParams[0]];