wesl-link 0.6.1 → 0.6.2

package/bin/wesl-link

@@ -2302,12 +2302,10 @@ function logInternalSrc(log2, src, pos, ...msgs) {
   log2(caret);
 }
 function carets(linePos, linePos2) {
-  const firstCaret = " ".repeat(linePos) + "^";
-  let secondCaret = "";
-  if (linePos2 && linePos2 > linePos) {
-    secondCaret = " ".repeat(linePos2 - linePos - 1) + "^";
-  }
-  return firstCaret + secondCaret;
+  const indent = " ".repeat(linePos);
+  const numCarets = linePos2 ? linePos2 - linePos : 1;
+  const carets2 = "^".repeat(numCarets);
+  return indent + carets2;
 }
 var startCache = /* @__PURE__ */ new Map();
 function srcLine(src, position) {
@@ -2563,6 +2561,18 @@ function opt(arg) {
     }
   );
 }
+function not(arg) {
+  const p = parserArg(arg);
+  return parser2("not", function _not(state) {
+    const pos = state.stream.checkpoint();
+    const result = p._run(state);
+    if (result === null) {
+      state.stream.reset(pos);
+      return { value: true };
+    }
+    return null;
+  });
+}
 function repeat(arg) {
   const p = parserArg(arg);
   return parser2("repeat", repeatWhileFilter(p));
@@ -3438,6 +3448,110 @@ function errorHighlight(source, span2) {
   ];
 }
 
+// ../wesl/src/vlq/vlq.ts
+var char_to_integer = {};
+var integer_to_char = {};
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".split("").forEach((char, i) => {
+  char_to_integer[char] = i;
+  integer_to_char[i] = char;
+});
+function encodeVlq(value) {
+  if (typeof value === "number") {
+    return encode_integer(value);
+  }
+  let result = "";
+  for (let i = 0; i < value.length; i += 1) {
+    result += encode_integer(value[i]);
+  }
+  return result;
+}
+function encode_integer(num) {
+  let result = "";
+  if (num < 0) {
+    num = -num << 1 | 1;
+  } else {
+    num <<= 1;
+  }
+  do {
+    let clamped = num & 31;
+    num >>>= 5;
+    if (num > 0) {
+      clamped |= 32;
+    }
+    result += integer_to_char[clamped];
+  } while (num > 0);
+  return result;
+}
+
+// ../wesl/src/ClickableError.ts
+function throwClickableError(params) {
+  const { url, text: text2, lineNumber, lineColumn, length, error } = params;
+  const mappings = encodeVlq([
+    0,
+    0,
+    Math.max(0, lineNumber - 1),
+    Math.max(0, lineColumn - 1)
+  ]) + "," + // Sadly no browser makes use of this info to map the error properly
+  encodeVlq([
+    18,
+    // Arbitrary number that is high enough
+    0,
+    Math.max(0, lineNumber - 1),
+    Math.max(0, lineColumn - 1) + length
+  ]);
+  const sourceMap = {
+    version: 3,
+    file: null,
+    sources: [url],
+    sourcesContent: [text2 ?? null],
+    names: [],
+    mappings
+  };
+  let generatedCode = `throw new Error(${JSON.stringify(error.message + "")})`;
+  generatedCode += "\n//# sourceMappingURL=data:application/json;base64," + btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
+  generatedCode += "\n//# sourceURL=" + sourceMap.sources[0];
+  let oldLimit = 0;
+  if ("stackTraceLimit" in Error) {
+    oldLimit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 1;
+  }
+  try {
+    (0, eval)(generatedCode);
+  } catch (e) {
+    if ("stackTraceLimit" in Error) {
+      Error.stackTraceLimit = oldLimit;
+    }
+    error.message = "";
+    if (tracing) e.cause = error;
+    throw e;
+  }
+}
+function failIdent(ident2, msg) {
+  const { refIdentElem, originalName } = ident2;
+  const baseMessage = msg ?? `'${originalName}'`;
+  if (refIdentElem) {
+    failIdentElem(refIdentElem, baseMessage);
+  } else {
+    throw new Error(baseMessage);
+  }
+}
+function failIdentElem(identElem, msg = "") {
+  const { srcModule, start, end } = identElem;
+  const { debugFilePath, src } = srcModule;
+  const detailedMessage = `${msg} in file: ${debugFilePath}`;
+  srcLog(src, [start, end], detailedMessage);
+  const [lineNumber, lineColumn] = offsetToLineNumber(start, src);
+  const length = end - start;
+  throwClickableError({
+    url: debugFilePath,
+    text: src,
+    lineNumber,
+    lineColumn,
+    length,
+    error: new Error(detailedMessage)
+  });
+}
+
 // ../wesl/src/Conditions.ts
 function elementValid(elem, conditions) {
   const attributes = elem.attributes;
@@ -3460,10 +3574,10 @@ function evaluateIfAttribute(ifAttribute, conditions) {
 }
 function evaluateIfExpression(expression2, conditions) {
   const { kind: kind2 } = expression2;
-  if (kind2 == "unary-expression") {
+  if (kind2 === "unary-expression") {
     assertThatDebug(expression2.operator.value === "!");
     return !evaluateIfExpression(expression2.expression, conditions);
-  } else if (kind2 == "binary-expression") {
+  } else if (kind2 === "binary-expression") {
     const op = expression2.operator.value;
     assertThatDebug(op === "||" || op === "&&");
     const leftResult = evaluateIfExpression(expression2.left, conditions);
@@ -3474,11 +3588,11 @@ function evaluateIfExpression(expression2, conditions) {
     } else {
       assertUnreachable2(op);
     }
-  } else if (kind2 == "literal") {
+  } else if (kind2 === "literal") {
     const { value } = expression2;
     assertThatDebug(value === "true" || value === "false");
     return value === "true";
-  } else if (kind2 == "parenthesized-expression") {
+  } else if (kind2 === "parenthesized-expression") {
     return evaluateIfExpression(expression2.expression, conditions);
   } else if (kind2 === "translate-time-feature") {
     return conditions[expression2.name];
@@ -3726,7 +3840,7 @@ function importElem(cc) {
 function addToOpenElem(cc, elem) {
   const weslContext = cc.app.context;
   const { openElems } = weslContext;
-  if (openElems && openElems.length) {
+  if (openElems?.length) {
     const open = openElems[openElems.length - 1];
     open.contents.push(elem);
   }
@@ -3888,7 +4002,7 @@ var fnCollect = collectElem(
     mergeScope(mergedScope, bodyScope);
     const filtered = [];
     for (const e of fnScope.contents) {
-      if (e === headerScope || e == returnScope) {
+      if (e === headerScope || e === returnScope) {
         continue;
       } else if (e === bodyScope) {
         filtered.push(mergedScope);
@@ -3989,7 +4103,7 @@ var typeRefCollect = collectElem(
   "type",
   // @ts-ignore
   (cc, openElem) => {
-    let templateParamsTemp = cc.tags.templateParam?.flat(3);
+    const templateParamsTemp = cc.tags.templateParam?.flat(3);
     const typeRef = cc.tags.typeRefName?.[0];
     const name2 = typeof typeRef === "string" ? typeRef : typeRef.ident;
     const partElem = {
@@ -4024,7 +4138,7 @@ var memberRefCollect = collectElem(
   "memberRef",
   (cc, openElem) => {
     const { component, structRef, extra_components } = cc.tags;
-    const member = component[0];
+    const member = component?.[0];
     const name2 = structRef?.flat()[0];
     const extraComponents = extra_components?.flat()[0];
     const partElem = {
@@ -4120,7 +4234,10 @@ function coverWithText(cc, elem) {
 // ../wesl/src/parse/WeslBaseGrammar.ts
 var word = kind("word");
 var keyword = kind("keyword");
-var qualified_ident = withSepPlus("::", or(word, "package", "super"));
+var qualified_ident = withSepPlus(
+  "::",
+  or(word, keyword, "package", "super")
+);
 var number = kind("number");
 
 // ../wesl/src/parse/ImportGrammar.ts
@@ -4144,8 +4261,10 @@ function prependSegments(segments, statement2) {
   return statement2;
 }
 var import_collection = null;
+var segment_blacklist = or("super", "package", "import", "as");
+var packageWord = preceded(not(segment_blacklist), or(word, keyword));
 var import_path_or_item = seq(
-  word,
+  packageWord,
   or(
     preceded(
       "::",
@@ -4305,7 +4424,7 @@ var WeslStream = class {
           this.stream.reset(this.skipBlockComment(token2.span[1]));
         }
       } else if (kind2 === "word") {
-        let returnToken = token2;
+        const returnToken = token2;
         if (keywordOrReserved.has(token2.text)) {
           returnToken.kind = "keyword";
         }
@@ -4393,7 +4512,7 @@ var WeslStream = class {
       if (nextToken.text === "<") {
         pendingCounter += 1;
       } else if (nextToken.text[0] === ">") {
-        if (nextToken.text === ">" || nextToken.text == ">=") {
+        if (nextToken.text === ">" || nextToken.text === ">=") {
           pendingCounter -= 1;
         } else if (nextToken.text === ">>=" || nextToken.text === ">>") {
           pendingCounter -= 2;
@@ -4633,11 +4752,25 @@ var special_attribute = tagScope(
     "@",
     or(
       // These attributes have no arguments
-      or("compute", "const", "fragment", "invariant", "must_use", "vertex").map((name2) => makeStandardAttribute([name2, []])),
+      or("compute", "const", "fragment", "invariant", "must_use", "vertex").map(
+        (name2) => makeStandardAttribute([name2, []])
+      ),
       // These attributes have arguments, but the argument doesn't have any identifiers
-      preceded("interpolate", req(delimited("(", name_list, ")"), "invalid @interpolate, expected '('")).map(makeInterpolateAttribute),
-      preceded("builtin", req(delimited("(", name, ")"), "invalid @builtin, expected '('")).map(makeBuiltinAttribute),
-      preceded("diagnostic", req(diagnostic_control, "invalid @diagnostic, expected '('")).map(makeDiagnosticAttribute)
+      preceded(
+        "interpolate",
+        req(
+          delimited("(", name_list, ")"),
+          "invalid @interpolate, expected '('"
+        )
+      ).map(makeInterpolateAttribute),
+      preceded(
+        "builtin",
+        req(delimited("(", name, ")"), "invalid @builtin, expected '('")
+      ).map(makeBuiltinAttribute),
+      preceded(
+        "diagnostic",
+        req(diagnostic_control, "invalid @diagnostic, expected '('")
+      ).map(makeDiagnosticAttribute)
     ).ptag("attr_variant")
   ).collect(specialAttribute)
 );
@@ -4673,7 +4806,7 @@ var normal_attribute = tagScope(
       ),
       // Everything else is also a normal attribute, optional expression list
       seq(
-        // we don't want this to interfere with if_attribute, 
+        // we don't want this to interfere with if_attribute,
         // but not("if") isn't necessary for now, since 'if' is a keyword, not a word
         word.ptag("name"),
         opt(() => attribute_argument_list)
@@ -4690,10 +4823,9 @@ var attribute_argument_list = delimited(
   ),
   req(")", "invalid attribute arguments, expected ')'")
 );
-var attribute_no_if = or(
-  special_attribute,
-  normal_attribute
-).ctag("attribute");
+var attribute_no_if = or(special_attribute, normal_attribute).ctag(
+  "attribute"
+);
 var attribute_incl_if = or(
   if_attribute,
   special_attribute,
@@ -4734,7 +4866,10 @@ var struct_member = tagScope(
   ).collect(collectStructMember)
 ).ctag("members");
 var 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(
@@ -4752,7 +4887,12 @@ var fnParam = tagScope(
   seq(
     opt_attributes.collect((cc) => cc.tags.attribute, "attributes"),
     word.collect(declCollect, "decl_elem"),
-    opt(seq(":", req(type_specifier, "invalid fn parameter, expected type specifier"))).collect(typedDecl, "param_name")
+    opt(
+      seq(
+        ":",
+        req(type_specifier, "invalid fn parameter, expected type specifier")
+      )
+    ).collect(typedDecl, "param_name")
   ).collect(collectFnParam)
 ).ctag("fn_param");
 var fnParamList = seq("(", withSep(",", fnParam), ")");
@@ -4944,16 +5084,10 @@ var regular_statement = or(
   )
 );
 var conditional_statement = tagScope(
-  seq(
-    opt_attributes,
-    regular_statement
-  ).collect(statementCollect).collect(partialScopeCollect)
+  seq(opt_attributes, regular_statement).collect(statementCollect).collect(partialScopeCollect)
 );
 var unconditional_statement = tagScope(
-  seq(
-    opt_attributes_no_if,
-    regular_statement
-  )
+  seq(opt_attributes_no_if, regular_statement)
 );
 var statement = or(
   compound_statement,
@@ -4962,10 +5096,7 @@ var statement = or(
 );
 var lhs_expression = or(
   simple_component_reference,
-  seq(
-    qualified_ident.collect(refIdent),
-    opt(component_or_swizzle)
-  ),
+  seq(qualified_ident.collect(refIdent), opt(component_or_swizzle)),
   seq(
     "(",
     () => lhs_expression,
@@ -4981,7 +5112,12 @@ var variable_or_value_statement = tagScope(
   or(
     // Also covers the = expression case
     local_variable_decl,
-    seq("const", req_optionally_typed_ident, req("=", "invalid const declaration, expected '='"), expression),
+    seq(
+      "const",
+      req_optionally_typed_ident,
+      req("=", "invalid const declaration, expected '='"),
+      expression
+    ),
     seq(
       "let",
       req_optionally_typed_ident,
@@ -5000,22 +5136,24 @@ var variable_updating_statement = or(
   seq("_", "=", expression)
 );
 var fn_decl = seq(
-  tagScope(
-    opt_attributes.collect((cc) => cc.tags.attribute || [])
-  ).ctag("fn_attributes"),
+  tagScope(opt_attributes.collect((cc) => cc.tags.attribute || [])).ctag(
+    "fn_attributes"
+  ),
   text("fn"),
   req(fnNameDecl, "invalid fn, expected function name"),
   seq(
-    req(fnParamList, "invalid fn, expected function parameters").collect(scopeCollect, "header_scope"),
-    opt(seq(
-      "->",
-      opt_attributes.collect((cc) => cc.tags.attribute, "return_attributes"),
-      type_specifier.ctag("return_type").collect(scopeCollect, "return_scope")
-    )),
-    req(
-      unscoped_compound_statement,
-      "invalid fn, expected function body"
-    ).ctag("body_statement").collect(scopeCollect, "body_scope")
+    req(fnParamList, "invalid fn, expected function parameters").collect(
+      scopeCollect,
+      "header_scope"
+    ),
+    opt(
+      seq(
+        "->",
+        opt_attributes.collect((cc) => cc.tags.attribute, "return_attributes"),
+        type_specifier.ctag("return_type").collect(scopeCollect, "return_scope")
+      )
+    ),
+    req(unscoped_compound_statement, "invalid fn, expected function body").ctag("body_statement").collect(scopeCollect, "body_scope")
   )
 ).collect(partialScopeCollect, "fn_partial_scope").collect(fnCollect);
 var global_value_decl = or(
@@ -5036,11 +5174,20 @@ var global_value_decl = or(
   ).collect(collectVarLike("const"))
 ).collect(partialScopeCollect);
 var 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, "alias_name"),
+  req(word, "invalid alias, expected name").collect(
+    globalDeclCollect,
+    "alias_name"
+  ),
   req("=", "invalid alias, expected '='"),
-  req(type_specifier, "invalid alias, expected type").collect(scopeCollect, "alias_scope"),
+  req(type_specifier, "invalid alias, expected type").collect(
+    scopeCollect,
+    "alias_scope"
+  ),
   req(";", "invalid alias, expected ';'")
 ).collect(aliasCollect);
 var const_assert = tagScope(
@@ -5255,91 +5402,6 @@ if (tracing) {
   });
 }
 
-// ../wesl/src/vlq/vlq.ts
-var char_to_integer = {};
-var integer_to_char = {};
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".split("").forEach(function(char, i) {
-  char_to_integer[char] = i;
-  integer_to_char[i] = char;
-});
-function encodeVlq(value) {
-  if (typeof value === "number") {
-    return encode_integer(value);
-  }
-  let result = "";
-  for (let i = 0; i < value.length; i += 1) {
-    result += encode_integer(value[i]);
-  }
-  return result;
-}
-function encode_integer(num) {
-  let result = "";
-  if (num < 0) {
-    num = -num << 1 | 1;
-  } else {
-    num <<= 1;
-  }
-  do {
-    let clamped = num & 31;
-    num >>>= 5;
-    if (num > 0) {
-      clamped |= 32;
-    }
-    result += integer_to_char[clamped];
-  } while (num > 0);
-  return result;
-}
-
-// ../wesl/src/WeslDevice.ts
-function throwClickableError({
-  url,
-  text: text2,
-  lineNumber,
-  lineColumn,
-  length,
-  error
-}) {
-  let mappings = encodeVlq([
-    0,
-    0,
-    Math.max(0, lineNumber - 1),
-    Math.max(0, lineColumn - 1)
-  ]) + "," + // Sadly no browser makes use of this info to map the error properly
-  encodeVlq([
-    18,
-    // Arbitrary number that is high enough
-    0,
-    Math.max(0, lineNumber - 1),
-    Math.max(0, lineColumn - 1) + length
-  ]);
-  const sourceMap = {
-    version: 3,
-    file: null,
-    sources: [url],
-    sourcesContent: [text2 ?? null],
-    names: [],
-    mappings
-  };
-  let generatedCode = `throw new Error(${JSON.stringify(error.message + "")})`;
-  generatedCode += "\n//# sourceMappingURL=data:application/json;base64," + btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
-  generatedCode += "\n//# sourceURL=" + sourceMap.sources[0];
-  let oldLimit = 0;
-  if ("stackTraceLimit" in Error) {
-    oldLimit = Error.stackTraceLimit;
-    Error.stackTraceLimit = 1;
-  }
-  try {
-    (0, eval)(generatedCode);
-  } catch (e) {
-    if ("stackTraceLimit" in Error) {
-      Error.stackTraceLimit = oldLimit;
-    }
-    error.message = "";
-    e.cause = error;
-    throw e;
-  }
-}
-
 // ../wesl/src/ParseWESL.ts
 var WeslParseError = class extends Error {
   constructor(opts) {
@@ -5526,7 +5588,7 @@ function findValidRootDecls(rootScope, conditions) {
   return found;
 }
 function bindIdentsRecursive(scope, bindContext, liveDecls, isRoot = false) {
-  const { conditions, foundScopes } = bindContext;
+  const { dontFollowDecls, foundScopes } = bindContext;
   if (foundScopes.has(scope)) return [];
   foundScopes.add(scope);
   const newGlobals = [];
@@ -5546,7 +5608,12 @@ function bindIdentsRecursive(scope, bindContext, liveDecls, isRoot = false) {
       }
     }
   });
-  const newFromRefs = newGlobals.flatMap((decl) => {
+  const newFromRefs = dontFollowDecls ? [] : handleDecls(newGlobals, bindContext);
+  return [newGlobals, newFromChildren, newFromRefs].flat();
+}
+function handleDecls(newGlobals, bindContext) {
+  const { conditions } = bindContext;
+  return newGlobals.flatMap((decl) => {
     const foundsScope = decl.dependentScope;
     if (foundsScope) {
       const rootDecls = globalDeclToRootLiveDecls(decl, conditions);
@@ -5557,7 +5624,6 @@ function bindIdentsRecursive(scope, bindContext, liveDecls, isRoot = false) {
     }
     return [];
   });
-  return [newGlobals, newFromChildren, newFromRefs].flat();
 }
 function handleRef(ident2, liveDecls, bindContext) {
   const { registry, conditions, unbound } = bindContext;
@@ -5570,7 +5636,7 @@ function handleRef(ident2, liveDecls, bindContext) {
     } else if (stdWgsl(ident2.originalName)) {
       ident2.std = true;
     } else if (!unbound) {
-      failMissingIdent(ident2);
+      failIdent(ident2, `unresolved identifier '${ident2.originalName}'`);
     }
   }
 }
@@ -5619,16 +5685,6 @@ function globalDeclToRootLiveDecls(decl, conditions) {
   root._scopeDecls = liveDecls;
   return liveDecls;
 }
-function failMissingIdent(ident2) {
-  const { refIdentElem } = ident2;
-  if (refIdentElem) {
-    const { srcModule, start, end } = refIdentElem;
-    const { debugFilePath: filePath } = srcModule;
-    const msg = `unresolved identifier '${ident2.originalName}' in file: ${filePath}`;
-    srcLog(srcModule.src, [start, end], msg);
-    throw new Error(msg);
-  }
-}
 function setMangledName(proposedName, decl, globalNames, srcModule, mangler) {
   if (!decl.mangledName) {
     let mangledName;
@@ -5674,8 +5730,8 @@ function findQualifiedImport(refIdent2, parsed, conditions, virtuals, unbound) {
       if (unbound) {
         unbound.push(modulePathParts);
       } else {
-        const msg = `ident ${modulePathParts.join("::")}, but module not found`;
-        console.log(msg);
+        const msg = `module not found for '${modulePathParts.join("::")}'`;
+        failIdent(refIdent2, msg);
       }
     }
     return result;
@@ -5753,16 +5809,21 @@ function lowerAndEmitElem(e, ctx) {
       return;
     // terminal elements copy strings to the output
     case "text":
-      return emitText(e, ctx);
+      emitText(e, ctx);
+      return;
     case "name":
-      return emitName(e, ctx);
+      emitName(e, ctx);
+      return;
     case "synthetic":
-      return emitSynthetic(e, ctx);
+      emitSynthetic(e, ctx);
+      return;
     // identifiers are copied to the output, but with potentially mangled names
     case "ref":
-      return emitRefIdent(e, ctx);
+      emitRefIdent(e, ctx);
+      return;
     case "decl":
-      return emitDeclIdent(e, ctx);
+      emitDeclIdent(e, ctx);
+      return;
     // container elements just emit their child elements
     case "param":
     case "var":
@@ -5776,7 +5837,8 @@ function lowerAndEmitElem(e, ctx) {
     case "statement":
     case "stuff":
     case "switch-clause":
-      return emitContents(e, ctx);
+      emitContents(e, ctx);
+      return;
     // root level container elements get some extra newlines to make the output prettier
     case "override":
     case "const":
@@ -5784,17 +5846,22 @@ function lowerAndEmitElem(e, ctx) {
     case "alias":
     case "gvar":
       emitRootElemNl(ctx);
-      return emitContents(e, ctx);
+      emitContents(e, ctx);
+      return;
     case "fn":
       emitRootElemNl(ctx);
-      return emitFn(e, ctx);
+      emitFn(e, ctx);
+      return;
     case "struct":
       emitRootElemNl(ctx);
-      return emitStruct(e, ctx);
+      emitStruct(e, ctx);
+      return;
     case "attribute":
-      return emitAttribute(e, ctx);
+      emitAttribute(e, ctx);
+      return;
     case "directive":
-      return emitDirective(e, ctx);
+      emitDirective(e, ctx);
+      return;
     default:
       assertUnreachable2(e);
   }
@@ -5843,7 +5910,9 @@ 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);
@@ -5869,12 +5938,8 @@ function emitStruct(e, ctx) {
 function warnEmptyStruct(e) {
   const { name: name2, members } = e;
   const condStr = members.length ? "(with current conditions)" : "";
-  const { debugFilePath: filePath } = name2.srcModule;
-  srcLog(
-    name2.srcModule.src,
-    e.start,
-    `struct ${name2.ident.originalName} in ${filePath} has no members ${condStr}`
-  );
+  const message = `struct '${name2.ident.originalName}' has no members ${condStr}`;
+  failIdentElem(name2, message);
 }
 function emitSynthetic(e, ctx) {
   const { text: text2 } = e;
@@ -6319,7 +6384,7 @@ var LinkedWesl = class {
       code: this.dest
     });
     device.popErrorScope();
-    let { promise, resolve: resolve5 } = Promise.withResolvers();
+    const { promise, resolve: resolve5 } = Promise.withResolvers();
     device.injectError("validation", promise);
     module.getCompilationInfo().then((compilationInfo) => {
       if (compilationInfo.messages.length === 0) {
@@ -6363,7 +6428,7 @@ var LinkedWesl = class {
     const srcPosition = srcMap.destToSrc(message.offset);
     const srcEndPosition = message.length > 0 ? srcMap.destToSrc(message.offset + message.length) : srcPosition;
     const length = srcEndPosition.position - srcPosition.position;
-    let [lineNum, linePos] = offsetToLineNumber(
+    const [lineNum, linePos] = offsetToLineNumber(
       srcPosition.position,
       srcPosition.src.text
     );
@@ -6386,7 +6451,7 @@ function compilationInfoToErrorMessage(compilationInfo, shaderModule) {
   if (compilationInfo.messages.length === 0) return null;
   let result = `Compilation log for [Invalid ShaderModule (${shaderModule.label || "unlabled"})]:
 `;
-  let errorCount = compilationInfo.messages.filter(
+  const errorCount = compilationInfo.messages.filter(
     (v) => v.type === "error"
   ).length;
   if (errorCount > 0) {
@@ -6497,7 +6562,8 @@ async function link(params) {
   const registry = parsedRegistry();
   parseIntoRegistry(weslSrc, registry, "package", debugWeslRoot);
   parseLibsIntoRegistry(libs, registry);
-  return new LinkedWesl(linkRegistry({ registry, ...params }));
+  const srcMap = linkRegistry({ registry, ...params });
+  return new LinkedWesl(srcMap);
 }
 function linkRegistry(params) {
   const bound = bindAndTransform(params);
@@ -6521,7 +6587,7 @@ function bindAndTransform(params) {
   if (constants) {
     virtualLibs = { ...virtualLibs, constants: constantsGenerator(constants) };
   }
-  let virtuals = virtualLibs && mapValues(virtualLibs, (fn2) => ({ fn: fn2 }));
+  const virtuals = virtualLibs && mapValues(virtualLibs, (fn2) => ({ fn: fn2 }));
   const bindParams = { rootAst, registry, conditions, virtuals, mangler };
   const bindResults = bindIdents(bindParams);
   const { globalNames, decls: newDecls, newStatements } = bindResults;
@@ -9897,26 +9963,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 /*! Bundled license information:
 
 yargs-parser/build/lib/string-utils.js:
-  (**
-   * @license
-   * Copyright (c) 2016, Contributors
-   * SPDX-License-Identifier: ISC
-   *)
-
 yargs-parser/build/lib/tokenize-arg-string.js:
-  (**
-   * @license
-   * Copyright (c) 2016, Contributors
-   * SPDX-License-Identifier: ISC
-   *)
-
 yargs-parser/build/lib/yargs-parser-types.js:
-  (**
-   * @license
-   * Copyright (c) 2016, Contributors
-   * SPDX-License-Identifier: ISC
-   *)
-
 yargs-parser/build/lib/yargs-parser.js:
   (**
    * @license

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl-link",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "type": "module",
   "repository": "https://github.com/wgsl-tooling-wg/wesl-js/tree/main/packages/cli",
   "homepage": "https://github.com/wgsl-tooling-wg/wesl-js/tree/main/packages/cli#readme",
@@ -9,12 +9,12 @@
   ],
   "bin": "bin/wesl-link",
   "dependencies": {
-    "@types/diff": "^7.0.1",
+    "@types/diff": "^7.0.2",
     "diff": "^7.0.0",
-    "wesl": "0.6.1"
+    "wesl": "0.6.2"
   },
   "devDependencies": {
-    "mini-parse": "0.6.1"
+    "mini-parse": "0.6.2"
   },
   "scripts": {
     "echo": "echo",