@shapeshift-labs/frontier-lang-parser 0.3.61 → 0.3.62

package/dist/index.js

@@ -303,12 +303,17 @@ function readTypeFields(body) {
 }
 function readVariants(body) {
   const variants = [];
+  const seenNames = new Set();
+  const seenIds = new Set();
   const re = /^\s*variant\s+([A-Za-z_$][\w$]*)(.*)$/gm;
   let match;
   while ((match = re.exec(body))) {
     const fields = readVariantPayloadFields(match[2] ?? '', match[1], parseTypeExpression);
     if (fields === null) continue;
     const id = /@id\(\s*["']([^"']+)["']\s*\)/.exec(match[2] ?? '')?.[1];
+    const variantId = id ?? `type_variant_${safeId(match[1])}`;
+    if (seenNames.has(match[1]) || seenIds.has(variantId)) continue;
+    seenNames.add(match[1]); seenIds.add(variantId);
     variants.push({ ...(id ? { id } : {}), name: match[1], ...(fields?.length ? { fields } : {}) });
   }
   return variants.length ? variants : undefined;

package/dist/source-syntax-children.js

@@ -24,18 +24,35 @@ export function readSourceSyntaxChildren(source, block, options = {}) {
 
 function readTypeSyntaxChildren(source, block, options) {
   const children = [];
+  const seenVariantNames = new Set();
+  const seenVariantIds = new Set();
   for (const line of readBodyLines(source, block)) {
     if (!line.text || line.text.startsWith('#')) continue;
     const variant = /^variant\s+([A-Za-z_$][\w$]*)(.*)$/.exec(line.text);
     if (!variant) continue;
     const [, name, rest] = variant;
     const payload = inspectVariantPayload(rest ?? '', inspectTypeExpressionSyntax);
+    const id = idFrom(rest, `type_variant_${safeId(name)}`);
+    let recognized = payload.ok;
+    let reason = payload.ok ? undefined : payload.reason;
+    if (recognized && seenVariantNames.has(name)) {
+      recognized = false;
+      reason = 'duplicate-type-variant-name';
+    }
+    if (recognized && seenVariantIds.has(id)) {
+      recognized = false;
+      reason = 'duplicate-type-variant-id';
+    }
+    if (recognized) {
+      seenVariantNames.add(name);
+      seenVariantIds.add(id);
+    }
     children.push(cleanRecord({
       kind: 'typeVariant',
       rowKind: 'variant',
       normalizedRowKind: 'variant',
       name,
-      id: idFrom(rest, `type_variant_${safeId(name)}`),
+      id,
       header: line.text,
       startOffset: line.startOffset,
       endOffset: line.endOffset,
@@ -46,8 +63,8 @@ function readTypeSyntaxChildren(source, block, options) {
       moduleId: block.moduleId,
       moduleName: block.moduleName,
       sourceSpan: sourceSpan(source, block, line.startOffset, line.endOffset, options),
-      recognized: payload.ok,
-      reason: payload.ok ? undefined : payload.reason,
+      recognized,
+      reason,
       fieldCount: payload.fieldCount,
       fieldIds: payload.fieldIds
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.61",
+  "version": "0.3.62",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",