@shapeshift-labs/frontier-lang-parser 0.3.65 → 0.3.67

package/dist/index.js

@@ -182,7 +182,7 @@ function parseLattice(block) {
 }
 function parseTarget(block) {
   const name = nameFrom(block.header);
-  const metadata = parseTargetProjectionMetadata(block.body, name);
+  const metadata = parseTargetProjectionMetadata(block, name);
   return targetNode({
     id: idFrom(block.header, `target_${name}`),
     name,

package/dist/operations.js

@@ -1,22 +1,28 @@
 export function parseSemanticOperationsBlock(block) {
   const name = nameFrom(block.header);
   const operationSet = { id: idFrom(block.header, `semanticOperations_${name}`), operations: [], metadata: { name } };
-  for (const rawLine of block.body.split('\n')) {
-    const line = rawLine.trim();
+  for (const authoredLine of readAuthoredLines(block)) {
+    const line = authoredLine.text;
     if (!line || line.startsWith('#')) continue;
     const match = /^(operation|op)\s+([A-Za-z_$][\w$-]*)(.*)$/.exec(line);
-    if (match) operationSet.operations.push(parseSemanticOperationRecord(match[2], match[3]));
+    if (match) operationSet.operations.push(parseSemanticOperationRecord(match[2], match[3], authoredLine));
   }
   return operationSet;
 }
 
-function parseSemanticOperationRecord(name, text) {
+function parseSemanticOperationRecord(name, text, authoredLine = {}) {
+  const sourceBackprojectionMode = readInlineWord('sourceBackprojection', text) ?? readInlineWord('sourceBackprojectionMode', text);
   return cleanRecord({
     id: idFrom(text, `semanticOperation_${name}`),
     operationKind: readInlineWord('operationKind', text) ?? readInlineWord('op', text) ?? readInlineWord('kind', text),
     language: readInlineWord('language', text),
     name,
     target: readInlineWord('target', text),
+    targetLanguage: readInlineWord('targetLanguage', text),
+    sourcePath: readInlineWord('sourcePath', text) ?? readInlineWord('path', text),
+    targetPath: readInlineWord('targetPath', text),
+    routeId: readInlineWord('route', text) ?? readInlineWord('routeId', text),
+    routeIds: readInlineList(text, 'routeIds'),
     nativeSourceId: readInlineWord('nativeSource', text) ?? readInlineWord('nativeSourceId', text),
     nativeAstId: readInlineWord('nativeAst', text) ?? readInlineWord('nativeAstId', text),
     nativeAstNodeIds: readInlineList(text, 'nativeAstNode', 'nativeAstNodes', 'nativeAstNodeIds'),
@@ -24,6 +30,7 @@ function parseSemanticOperationRecord(name, text) {
     semanticSymbolIds: readInlineList(text, 'semanticSymbol', 'semanticSymbols', 'semanticSymbolIds'),
     semanticOccurrenceIds: readInlineList(text, 'semanticOccurrence', 'semanticOccurrences', 'semanticOccurrenceIds'),
     sourceMapIds: readInlineList(text, 'sourceMap', 'sourceMaps', 'sourceMapIds'),
+    sourceMapLinkIds: readInlineList(text, 'sourceMapLink', 'sourceMapLinks', 'sourceMapLinkIds'),
     sourceMapMappingIds: readInlineList(text, 'sourceMapMapping', 'sourceMapMappings', 'sourceMapMappingIds'),
     proofObligationIds: readInlineList(text, 'proofObligation', 'proofObligations', 'proofObligationIds'),
     proofArtifactIds: readInlineList(text, 'proofArtifact', 'proofArtifacts', 'proofArtifactIds'),
@@ -36,12 +43,94 @@ function parseSemanticOperationRecord(name, text) {
     ownershipKeys: readInlineList(text, 'ownerKey', 'ownershipKey', 'ownershipKeys'),
     conflictKeys: readInlineList(text, 'conflictKey', 'conflictKeys'),
     readiness: readInlineWord('readiness', text),
+    status: readInlineWord('status', text),
+    action: readInlineWord('action', text),
+    changeKind: readInlineWord('changeKind', text),
+    regionKind: readInlineWord('regionKind', text),
+    regionId: readInlineWord('region', text) ?? readInlineWord('regionId', text),
+    symbolName: readInlineWord('symbolName', text),
+    symbolKind: readInlineWord('symbolKind', text),
+    symbolId: readInlineWord('symbolId', text),
+    semanticKey: readInlineWord('semanticKey', text),
+    semanticIdentityHash: readInlineWord('semanticIdentityHash', text),
+    sourceIdentityHash: readInlineWord('sourceIdentityHash', text),
+    operationContentHash: readInlineWord('operationContentHash', text),
+    editContentHash: readInlineWord('editContentHash', text),
+    editScriptIds: readInlineList(text, 'editScript', 'editScriptId', 'editScriptIds'),
+    patchIds: readInlineList(text, 'patch', 'patchId', 'patchIds'),
+    patchHash: readInlineWord('patchHash', text),
+    editScriptHash: readInlineWord('editScriptHash', text),
+    baseHash: readInlineWord('baseHash', text),
+    targetHash: readInlineWord('targetHash', text),
+    baseTextHash: readInlineWord('baseTextHash', text),
+    workerTextHash: readInlineWord('workerTextHash', text),
+    headTextHash: readInlineWord('headTextHash', text),
+    projectionContractIds: readInlineList(text, 'projectionContract', 'projectionContractId', 'projectionContractIds'),
+    projectionLayerIds: readInlineList(text, 'projectionLayer', 'projectionLayerId', 'projectionLayerIds'),
+    targetProjectionIds: readInlineList(text, 'targetProjection', 'targetProjectionId', 'targetProjectionIds'),
+    projectionHash: readInlineWord('projectionHash', text),
+    semanticEditScriptId: readInlineWord('semanticEditScript', text) ?? readInlineWord('semanticEditScriptId', text) ?? readInlineWord('script', text) ?? readInlineWord('scriptId', text),
+    semanticEditProjectionId: readInlineWord('semanticEditProjection', text) ?? readInlineWord('semanticEditProjectionId', text) ?? readInlineWord('projection', text) ?? readInlineWord('projectionId', text),
+    semanticEditReplayId: readInlineWord('semanticEditReplay', text) ?? readInlineWord('semanticEditReplayId', text) ?? readInlineWord('replay', text) ?? readInlineWord('replayId', text),
+    replayRecordIds: readInlineList(text, 'replayRecord', 'replayRecordId', 'replayRecordIds'),
+    replayEventIds: readInlineList(text, 'replayEvent', 'replayEventId', 'replayEventIds'),
+    replayStatus: readInlineWord('replayStatus', text),
+    replayAction: readInlineWord('replayAction', text),
+    replayCurrentHash: readInlineWord('replayCurrentHash', text) ?? readInlineWord('currentHash', text),
+    replayOutputHash: readInlineWord('replayOutputHash', text) ?? readInlineWord('outputHash', text),
+    replayReasonCodes: readInlineList(text, 'replayReasonCode', 'replayReasonCodes'),
+    finalHash: readInlineWord('finalHash', text),
+    replayHash: readInlineWord('replayHash', text),
+    deterministic: readInlineFlag('deterministic', text),
+    replayComplete: readInlineFlag('replayComplete', text),
+    admissionDecisionIds: readInlineList(text, 'admissionDecision', 'admissionDecisionId', 'admissionDecisionIds'),
+    semanticMergeCandidateIds: readInlineList(text, 'semanticMergeCandidate', 'semanticMergeCandidateId', 'semanticMergeCandidateIds'),
+    classification: readInlineWord('classification', text),
+    decision: readInlineWord('decision', text),
+    autoMergeable: readInlineFlag('autoMergeable', text),
+    conflictKeyKinds: readInlineList(text, 'conflictKeyKind', 'conflictKeyKinds'),
+    admissionStatus: readInlineWord('admissionStatus', text),
+    admissionAction: readInlineWord('admissionAction', text),
+    admissionReadiness: readInlineWord('admissionReadiness', text),
+    semanticTransformId: readInlineWord('semanticTransform', text) ?? readInlineWord('semanticTransformId', text) ?? readInlineWord('transform', text) ?? readInlineWord('transformId', text),
+    transformId: readInlineWord('transformId', text) ?? readInlineWord('transform', text),
+    transformKey: readInlineWord('transformKey', text),
+    transformHash: readInlineWord('transformHash', text),
+    identityHash: readInlineWord('identityHash', text),
+    transformIdentityHash: readInlineWord('transformIdentityHash', text),
+    transformContentHash: readInlineWord('transformContentHash', text),
+    projectionIdentityHash: readInlineWord('projectionIdentityHash', text),
+    sourceBackprojectionMode,
+    sourceBackprojection: sourceBackprojectionMode ? { mode: sourceBackprojectionMode } : undefined,
+    sourceSpan: authoredLine.sourceSpan,
+    authoredSourceSpan: authoredLine.sourceSpan,
     dynamic: readInlineFlag('dynamic', text),
     opaque: readInlineFlag('opaque', text),
     summary: readInlineQuoted('summary', text)
   });
 }
 
+function readAuthoredLines(block) {
+  const lines = block.body.split('\n');
+  const records = [];
+  let lineStart = block.syntax?.bodyStartOffset ?? 0;
+  for (const rawLine of lines) {
+    const rawEnd = lineStart + rawLine.length;
+    const leading = /^\s*/.exec(rawLine)?.[0].length ?? 0;
+    const trailing = /\s*$/.exec(rawLine)?.[0].length ?? 0;
+    const startOffset = lineStart + leading;
+    const endOffset = Math.max(startOffset, rawEnd - trailing);
+    records.push({
+      text: rawLine.trim(),
+      startOffset,
+      endOffset,
+      sourceSpan: typeof block.sourceSpan === 'function' ? block.sourceSpan(startOffset, endOffset) : undefined
+    });
+    lineStart = rawEnd + 1;
+  }
+  return records;
+}
+
 function idFrom(text, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(text)?.[1] ?? fallback; }
 function nameFrom(header) { return /^([A-Za-z_$][\w$]*)/.exec(header)?.[1] ?? 'SemanticOperations'; }
 function readInlineWord(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }

package/dist/target-projection.js

@@ -1,6 +1,6 @@
-export function parseTargetProjectionMetadata(body, targetName) {
-  const projectionContracts = readTargetProjectionContracts(body, targetName);
-  const projectionLayers = readTargetProjectionLayers(body, targetName);
+export function parseTargetProjectionMetadata(blockOrBody, targetName) {
+  const projectionContracts = readTargetProjectionContracts(blockOrBody, targetName);
+  const projectionLayers = readTargetProjectionLayers(blockOrBody, targetName);
   if (!projectionContracts.length && !projectionLayers.length) return undefined;
   return cleanObject({
     authoredTargetProjection: true,
@@ -17,11 +17,11 @@ export function parseTargetProjectionMetadata(body, targetName) {
   });
 }
 
-function readTargetProjectionContracts(body, targetName) {
+function readTargetProjectionContracts(blockOrBody, targetName) {
   const rows = [];
-  const re = /^\s*(projection|lowering)\s+([A-Za-z_$][\w$-]*)([^\n]*)$/gm;
-  let match;
-  while ((match = re.exec(body))) {
+  for (const authoredLine of readAuthoredLines(blockOrBody)) {
+    const match = /^(projection|lowering)\s+([A-Za-z_$][\w$-]*)(.*)$/.exec(authoredLine.text);
+    if (!match) continue;
     const [, rowKind, name, text] = match;
     rows.push(cleanObject({
       id: idFrom(text, `target_projection_${targetName}_${name}`),
@@ -41,6 +41,8 @@ function readTargetProjectionContracts(body, targetName) {
       missingEvidence: readInlineList(text, 'missingEvidence'),
       review: readInlineList(text, 'review'),
       blockers: readInlineList(text, 'blocker', 'blockers'),
+      sourceSpan: authoredLine.sourceSpan,
+      authoredSourceSpan: authoredLine.sourceSpan,
       semanticEquivalenceClaim: false,
       autoMergeClaim: false
     }));
@@ -48,11 +50,11 @@ function readTargetProjectionContracts(body, targetName) {
   return rows;
 }
 
-function readTargetProjectionLayers(body, targetName) {
+function readTargetProjectionLayers(blockOrBody, targetName) {
   const rows = [];
-  const re = /^\s*layer\s+([A-Za-z_$][\w$-]*)([^\n]*)$/gm;
-  let match;
-  while ((match = re.exec(body))) {
+  for (const authoredLine of readAuthoredLines(blockOrBody)) {
+    const match = /^layer\s+([A-Za-z_$][\w$-]*)(.*)$/.exec(authoredLine.text);
+    if (!match) continue;
     const [, name, text] = match;
     rows.push(cleanObject({
       id: idFrom(text, `target_layer_${targetName}_${name}`),
@@ -64,6 +66,8 @@ function readTargetProjectionLayers(body, targetName) {
       missingEvidence: readInlineList(text, 'missingEvidence'),
       review: readInlineList(text, 'review'),
       blockers: readInlineList(text, 'blocker', 'blockers'),
+      sourceSpan: authoredLine.sourceSpan,
+      authoredSourceSpan: authoredLine.sourceSpan,
       semanticEquivalenceClaim: false,
       autoMergeClaim: false
     }));
@@ -71,6 +75,28 @@ function readTargetProjectionLayers(body, targetName) {
   return rows;
 }
 
+function readAuthoredLines(blockOrBody) {
+  const body = typeof blockOrBody === 'string' ? blockOrBody : blockOrBody?.body ?? '';
+  const lines = body.split('\n');
+  const records = [];
+  let lineStart = typeof blockOrBody === 'string' ? 0 : blockOrBody?.syntax?.bodyStartOffset ?? 0;
+  for (const rawLine of lines) {
+    const rawEnd = lineStart + rawLine.length;
+    const leading = /^\s*/.exec(rawLine)?.[0].length ?? 0;
+    const trailing = /\s*$/.exec(rawLine)?.[0].length ?? 0;
+    const startOffset = lineStart + leading;
+    const endOffset = Math.max(startOffset, rawEnd - trailing);
+    records.push({
+      text: rawLine.trim(),
+      startOffset,
+      endOffset,
+      sourceSpan: typeof blockOrBody?.sourceSpan === 'function' ? blockOrBody.sourceSpan(startOffset, endOffset) : undefined
+    });
+    lineStart = rawEnd + 1;
+  }
+  return records;
+}
+
 function idFrom(text, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(text)?.[1] ?? fallback; }
 function readInlineWord(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }
 function readInlineList(text, ...labels) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.65",
+  "version": "0.3.67",
   "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/member-identity-smoke.mjs && node test/generic-row-parse-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",
+    "test": "npm run build && node test/smoke.mjs && node test/member-identity-smoke.mjs && node test/generic-row-parse-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/semantic-operation-edit-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",