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

package/dist/index.js

@@ -1,4 +1,4 @@
-import { actionNode, capabilityNode, createDocument, effectNode, entityNode, externNode, latticeNode, migrationNode, stateNode, targetNode, typeNode } from '@shapeshift-labs/frontier-lang-kernel';
+import { actionNode, capabilityNode, createDocument, effectNode, externNode, latticeNode, migrationNode, targetNode, typeNode } from '@shapeshift-labs/frontier-lang-kernel';
 import { readActionBodyRecords, stripNestedBlocks } from './action-body.js';
 import { parseConstraintSpaceBlock } from './constraint-space.js';
 import { parseConversionBlock } from './conversion.js';
@@ -8,6 +8,7 @@ import { parseDecisionGraphBlock } from './decision-graph.js';
 import { parseDialectRegistryBlock } from './dialect-registry.js';
 import { parseInterlinguaBlock } from './interlingua.js';
 import { createParsedMetadata } from './metadata.js';
+import { parseEntityBlock, parseStateBlock, readTypeFields } from './member-records.js';
 import { parseSemanticOperationsBlock } from './operations.js';
 import { parsePackageManifestBlock } from './package-manifest.js';
 import { parseParadigmBlock } from './paradigm.js';
@@ -85,40 +86,8 @@ function readBlocks(source, options) {
 }
 function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
 function nameFrom(header) { return /^([A-Za-z_$][\w$]*)/.exec(header)?.[1] ?? 'Unnamed'; }
-function parseEntity(block) {
-  const name = nameFrom(block.header);
-  const fields = [];
-  const fieldRe = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^@{\n]+)([^\n{]*)(?:\{([^}]*)\})?/gm;
-  let m;
-  while ((m = fieldRe.exec(block.body))) {
-    const mergeText = (m[4] ?? '') + ' ' + (m[5] ?? '');
-    fields.push({
-      id: m[2] ?? `field_${name}_${m[1]}`,
-      name: m[1],
-      type: parseTypeExpression(m[3].trim()),
-      key: /@key/.test(m[4] ?? ''),
-      merge: parseMerge(mergeText),
-      semantic: parseSemantic(mergeText)
-    });
-  }
-  return entityNode({ id: idFrom(block.header, `ent_${name}`), name, fields });
-}
-function parseState(block) {
-  const name = nameFrom(block.header);
-  const collections = [];
-  const re = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^@{\n]+)(?:\{([^}]*)\})?/gm;
-  let m;
-  while ((m = re.exec(block.body))) {
-    collections.push({
-      id: m[2] ?? `collection_${name}_${m[1]}`,
-      name: m[1],
-      type: parseTypeExpression(m[3].trim()),
-      merge: parseMerge(m[4] ?? ''),
-      semantic: parseSemantic(m[4] ?? '')
-    });
-  }
-  return stateNode({ id: idFrom(block.header, `state_${name}`), name, collections });
-}
+function parseEntity(block) { return parseEntityBlock(block, idFrom, nameFrom); }
+function parseState(block) { return parseStateBlock(block, idFrom, nameFrom); }
 function parseAction(block) {
   const name = nameFrom(block.header);
   const topLevelBody = stripNestedBlocks('body', block.body);
@@ -277,30 +246,6 @@ function readChangeRecords(body) {
   }
   return changes;
 }
-function parseMerge(text) {
-  const kind = /merge\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
-  if (!kind) return undefined;
-  const law = /law\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
-  const laws = /laws\s+([A-Za-z][\w-]*(?:\s*,\s*[A-Za-z][\w-]*)*)/.exec(text)?.[1]?.split(',').map((item) => item.trim()).filter(Boolean);
-  const latticeId = /lattice\s+([A-Za-z_$][\w$-]*)/.exec(text)?.[1];
-  return { kind, law, laws, latticeId };
-}
-function parseSemantic(text) {
-  const crdtType = /crdt\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
-  const latticeId = /lattice\s+([A-Za-z_$][\w$-]*)/.exec(text)?.[1];
-  if (crdtType) return { kind: 'crdt', latticeId, crdt: { type: crdtType } };
-  if (latticeId) return { kind: 'lattice', latticeId };
-  return undefined;
-}
-function readTypeFields(body) {
-  const fields = [];
-  const re = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^\n]+)/gm;
-  let match;
-  while ((match = re.exec(body))) {
-    fields.push({ id: match[2] ?? `type_field_${match[1]}`, name: match[1], type: parseTypeExpression(match[3].trim()) });
-  }
-  return fields.length ? fields : undefined;
-}
 function readVariants(body) {
   const variants = [];
   const seenNames = new Set();

package/dist/member-records.js

@@ -0,0 +1,74 @@
+import { entityNode, stateNode } from '@shapeshift-labs/frontier-lang-kernel';
+import { parseTypeExpression } from './type-expressions.js';
+
+export function parseEntityBlock(block, idFrom, nameFrom) {
+  const name = nameFrom(block.header);
+  const fields = [], seen = identitySets();
+  const fieldRe = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^@{\n]+)([^\n{]*)(?:\{([^}]*)\})?/gm;
+  let m;
+  while ((m = fieldRe.exec(block.body))) {
+    const mergeText = (m[4] ?? '') + ' ' + (m[5] ?? '');
+    appendUnique(fields, seen, {
+      id: m[2] ?? `field_${name}_${m[1]}`,
+      name: m[1],
+      type: parseTypeExpression(m[3].trim()),
+      key: /@key/.test(m[4] ?? ''),
+      merge: parseMerge(mergeText),
+      semantic: parseSemantic(mergeText)
+    });
+  }
+  return entityNode({ id: idFrom(block.header, `ent_${name}`), name, fields });
+}
+
+export function parseStateBlock(block, idFrom, nameFrom) {
+  const name = nameFrom(block.header);
+  const collections = [], seen = identitySets();
+  const re = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^@{\n]+)(?:\{([^}]*)\})?/gm;
+  let m;
+  while ((m = re.exec(block.body))) {
+    appendUnique(collections, seen, {
+      id: m[2] ?? `collection_${name}_${m[1]}`,
+      name: m[1],
+      type: parseTypeExpression(m[3].trim()),
+      merge: parseMerge(m[4] ?? ''),
+      semantic: parseSemantic(m[4] ?? '')
+    });
+  }
+  return stateNode({ id: idFrom(block.header, `state_${name}`), name, collections });
+}
+
+export function readTypeFields(body) {
+  const fields = [], seen = identitySets();
+  const re = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*([^\n]+)/gm;
+  let match;
+  while ((match = re.exec(body))) {
+    appendUnique(fields, seen, { id: match[2] ?? `type_field_${match[1]}`, name: match[1], type: parseTypeExpression(match[3].trim()) });
+  }
+  return fields.length ? fields : undefined;
+}
+
+function identitySets() {
+  return { names: new Set(), ids: new Set() };
+}
+
+function appendUnique(records, seen, record) {
+  if (seen.names.has(record.name) || seen.ids.has(record.id)) return;
+  seen.names.add(record.name); seen.ids.add(record.id); records.push(record);
+}
+
+function parseMerge(text) {
+  const kind = /merge\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
+  if (!kind) return undefined;
+  const law = /law\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
+  const laws = /laws\s+([A-Za-z][\w-]*(?:\s*,\s*[A-Za-z][\w-]*)*)/.exec(text)?.[1]?.split(',').map((item) => item.trim()).filter(Boolean);
+  const latticeId = /lattice\s+([A-Za-z_$][\w$-]*)/.exec(text)?.[1];
+  return { kind, law, laws, latticeId };
+}
+
+function parseSemantic(text) {
+  const crdtType = /crdt\s+([A-Za-z][\w-]*)/.exec(text)?.[1];
+  const latticeId = /lattice\s+([A-Za-z_$][\w$-]*)/.exec(text)?.[1];
+  if (crdtType) return { kind: 'crdt', latticeId, crdt: { type: crdtType } };
+  if (latticeId) return { kind: 'lattice', latticeId };
+  return undefined;
+}

package/dist/source-syntax-children.js

@@ -15,6 +15,22 @@ export function readSourceSyntaxChildren(source, block, options = {}) {
     children = readConversionSyntaxChildren(source, block, options);
   } else if (block.kind === 'type') {
     children = readTypeSyntaxChildren(source, block, options);
+  } else if (block.kind === 'entity') {
+    children = readMemberSyntaxChildren(source, block, options, {
+      kind: 'entityField',
+      rowKind: 'field',
+      idPrefix: `field_${safeId(block.name)}_`,
+      duplicateNameReason: 'duplicate-entity-field-name',
+      duplicateIdReason: 'duplicate-entity-field-id'
+    });
+  } else if (block.kind === 'state') {
+    children = readMemberSyntaxChildren(source, block, options, {
+      kind: 'stateCollection',
+      rowKind: 'collection',
+      idPrefix: `collection_${safeId(block.name)}_`,
+      duplicateNameReason: 'duplicate-state-collection-name',
+      duplicateIdReason: 'duplicate-state-collection-id'
+    });
   } else {
     const rowConfig = ROW_SYNTAX_CONFIG[block.kind];
     if (rowConfig) children = readGenericRowSyntaxChildren(source, block, options, rowConfig);
@@ -23,7 +39,13 @@ export function readSourceSyntaxChildren(source, block, options = {}) {
 }
 
 function readTypeSyntaxChildren(source, block, options) {
-  const children = [];
+  const children = readMemberSyntaxChildren(source, block, options, {
+    kind: 'typeField',
+    rowKind: 'typeField',
+    idPrefix: 'type_field_',
+    duplicateNameReason: 'duplicate-type-field-name',
+    duplicateIdReason: 'duplicate-type-field-id'
+  });
   const seenVariantNames = new Set();
   const seenVariantIds = new Set();
   for (const line of readBodyLines(source, block)) {
@@ -72,6 +94,46 @@ function readTypeSyntaxChildren(source, block, options) {
   return children;
 }
 
+function readMemberSyntaxChildren(source, block, options, config) {
+  const children = [];
+  const seenNames = new Set(), seenIds = new Set();
+  for (const line of readBodyLines(source, block)) {
+    if (!line.text || line.text.startsWith('#')) continue;
+    const member = /^([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?\s*:\s*(.+)$/.exec(line.text);
+    if (!member) continue;
+    const [, name, explicitId] = member;
+    const id = explicitId ?? `${config.idPrefix}${safeId(name)}`;
+    let recognized = true, reason;
+    if (seenNames.has(name)) { recognized = false; reason = config.duplicateNameReason; }
+    if (recognized && seenIds.has(id)) { recognized = false; reason = config.duplicateIdReason; }
+    if (recognized) { seenNames.add(name); seenIds.add(id); }
+    children.push(memberChild(source, block, options, line, { ...config, name, id, recognized, reason }));
+  }
+  return children;
+}
+
+function memberChild(source, block, options, line, input) {
+  return cleanRecord({
+    kind: input.kind,
+    rowKind: input.rowKind,
+    normalizedRowKind: input.rowKind,
+    name: input.name,
+    id: input.id,
+    header: line.text,
+    startOffset: line.startOffset,
+    endOffset: line.endOffset,
+    location: sourcePosition(source, line.startOffset),
+    parentKind: block.kind,
+    parentId: block.id,
+    parentName: block.name,
+    moduleId: block.moduleId,
+    moduleName: block.moduleName,
+    sourceSpan: sourceSpan(source, block, line.startOffset, line.endOffset, options),
+    recognized: input.recognized,
+    reason: input.reason
+  });
+}
+
 function readConversionSyntaxChildren(source, block, options) {
   const children = [];
   for (const line of readBodyLines(source, block)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.62",
+  "version": "0.3.63",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
   ],
   "scripts": {
     "build": "node scripts/build.mjs",
-    "test": "npm run build && node test/smoke.mjs && node test/type-variant-payload-smoke.mjs && node test/type-generic-ref-smoke.mjs && node test/type-parameter-constraints-smoke.mjs && node test/type-structural-expression-smoke.mjs && node test/action-body-smoke.mjs && node test/action-structured-literals-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-match-smoke.mjs && node test/action-for-in-smoke.mjs && node test/action-repeat-smoke.mjs && node test/action-call-smoke.mjs && node test/target-projection-aggregate-smoke.mjs && node test/conversion-constraint-fields-smoke.mjs && node test/conversion-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/resource-graph-smoke.mjs && node test/interlingua-smoke.mjs && node test/dialect-registry-smoke.mjs",
+    "test": "npm run build && node test/smoke.mjs && node test/member-identity-smoke.mjs && node test/type-variant-payload-smoke.mjs && node test/type-generic-ref-smoke.mjs && node test/type-parameter-constraints-smoke.mjs && node test/type-structural-expression-smoke.mjs && node test/action-body-smoke.mjs && node test/action-structured-literals-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-match-smoke.mjs && node test/action-for-in-smoke.mjs && node test/action-repeat-smoke.mjs && node test/action-call-smoke.mjs && node test/target-projection-aggregate-smoke.mjs && node test/conversion-constraint-fields-smoke.mjs && node test/conversion-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/resource-graph-smoke.mjs && node test/interlingua-smoke.mjs && node test/dialect-registry-smoke.mjs",
     "typecheck": "node ./node_modules/typescript/bin/tsc --noEmit -p test/tsconfig.json",
     "fuzz": "npm run build && node fuzz/smoke.mjs",
     "bench": "npm run build && node bench/smoke.mjs",