@shapeshift-labs/frontier-lang-parser 0.3.83 → 0.3.84

package/dist/source-evidence.js

@@ -4,6 +4,7 @@ export function parseNativeSourceBlock(block) {
   const name = nameFrom(block.header);
   const losses = parseLosses(name, block.body);
   const nativeSourceId = idFrom(block.header, `native_${name}`);
+  const language = readWord('language', block.body) ?? readWord('sourceLanguage', block.body) ?? name;
   const evidence = parseEvidenceRecords(block.body);
   const sourceMaps = parseSourceMaps(block.body, {
     nativeSourceId,
@@ -13,7 +14,7 @@ export function parseNativeSourceBlock(block) {
   });
   const mergeCandidates = parseMergeCandidates(block.body, {
     nativeSourceId,
-    language: readWord('language', block.body) ?? name,
+    language,
     sourcePath: readWord('sourcePath', block.body) ?? readWord('path', block.body),
     sourceMaps,
     evidence
@@ -21,13 +22,13 @@ export function parseNativeSourceBlock(block) {
   const node = nativeSourceNode({
     id: nativeSourceId,
     name,
-    language: readWord('language', block.body) ?? name,
+    language,
     parser: readWord('parser', block.body),
     parserVersion: readWord('parserVersion', block.body),
     sourcePath: readWord('sourcePath', block.body) ?? readWord('path', block.body),
     sourceHash: readWord('sourceHash', block.body),
     symbol: readWord('symbol', block.body),
-    frontierNodeIds: readList('frontierNodes', block.body),
+    frontierNodeIds: readList('frontierNodes', block.body) ?? readList('frontierNodeIds', block.body) ?? readList('frontierNodeId', block.body) ?? readList('frontierNode', block.body),
     sourceMapIds: sourceMaps.map((sourceMap) => sourceMap.id),
     mergeCandidateIds: mergeCandidates.map((candidate) => candidate.id),
     evidenceIds: evidence.map((record) => record.id),
@@ -139,7 +140,7 @@ function parseMergeCandidates(body, context) {
     const sourceMapMappingIds = readInlineList(rest, 'sourceMapMapping', 'sourceMapMappings', 'sourceMapMappingIds');
     return createSemanticMergeCandidateRecord(cleanRecord({
       id: idFrom(rest, `merge_candidate_${name}`),
-      language: readInlineWord('language', rest) ?? context.language,
+      language: readInlineWord('language', rest) ?? readInlineWord('sourceLanguage', rest) ?? context.language,
       sourcePath: readInlineWord('sourcePath', rest) ?? readInlineWord('path', rest) ?? context.sourcePath,
       baseHash: readInlineWord('baseHash', rest),
       targetHash: readInlineWord('targetHash', rest),

package/dist/source-syntax-row-config.js

@@ -11,6 +11,7 @@ const semanticEditRows = words('script semanticEditScript projection semanticEdi
 const gateAdmissionRows = words('gate evidence proofEvidence admission admissionDecision proofObligation obligation gap proofGap');
 const resourceRows = words('sourceLanguage language sourcePath path sourceHash status evidence evidenceIds resource owner loan alias move drop escape lifetime lifetimeRegion life outlives lifetimeRelation lifeRelation borrow borrowScope borrowRegion unsafe unsafeBoundary memory memoryRegion region layout dataLayout pointer ptr address access memoryAccess atomic volatile abi abiBoundary callBoundary sync synchronization synchronisation synchronizationEdge synchronisationEdge happensBefore happens-before hb fence fenceEdge barrier barrierEdge trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation proofEvidence sourceMap sourcemap mapping sourceMapMapping missingEvidence');
 const targetRows = words('language targetLanguage sourceLanguage package packageName emitPath targetPath sourcePath path sourceHash targetHash runtime runtimeHost moduleFormat projection lowering lower layer adapter adapterId readiness disposition status evidence proofEvidence proof loss missingEvidence gap proofGap sourceMap sourcemap mapping sourceMapMapping');
+const nativeSourceRows = words('language sourceLanguage parser parserVersion sourcePath path sourceHash symbol frontierNodes frontierNode frontierNodeId frontierNodeIds loss evidence proofEvidence sourceMap sourcemap mapping sourceMapMapping mergeCandidate candidate');
 const coreFailClosed = (reason) => ({ failClosedUnknownRows: true, unknownRowReason: reason });
 
 export const ROW_SYNTAX_CONFIG = Object.freeze({
@@ -56,7 +57,7 @@ export const ROW_SYNTAX_CONFIG = Object.freeze({
   paradigm: rowConfig('paradigmRow', 'paradigm_row', words('valueSemantics mutationModel effectModel ownership ownershipModel lifetime lifetimeModel bindingScope binding dispatch typeModel moduleModel concurrency errorModel memoryModel evaluation metaprogramming interop lowering'), normalizeParadigmRow),
   paradigmSemantics: rowConfig('paradigmRow', 'paradigm_row', words('valueSemantics mutationModel effectModel ownership ownershipModel lifetime lifetimeModel bindingScope binding dispatch typeModel moduleModel concurrency errorModel memoryModel evaluation metaprogramming interop lowering'), normalizeParadigmRow),
   proof: rowConfig('proofRow', 'proof_row', words('contract refinement invariant termination temporal obligation artifact assumption')),
-  nativeSource: rowConfig('nativeSourceRow', 'native_source_row', words('loss evidence proofEvidence sourceMap sourcemap mapping sourceMapMapping mergeCandidate candidate'), normalizeNativeSourceRow)
+  nativeSource: rowConfig('nativeSourceRow', 'native_source_row', nativeSourceRows, normalizeNativeSourceRow, coreFailClosed('unsupported-native-source-row'))
 });
 
 function rowConfig(childKind, idPrefix, rowKinds, normalize, options = {}) {
@@ -234,6 +235,9 @@ function normalizeParadigmRow(rowKind) {
 }
 
 function normalizeNativeSourceRow(rowKind) {
+  if (rowKind === 'sourceLanguage') return 'language';
+  if (rowKind === 'path') return 'sourcePath';
+  if (rowKind === 'frontierNode' || rowKind === 'frontierNodeId' || rowKind === 'frontierNodeIds') return 'frontierNodes';
   if (rowKind === 'proofEvidence') return 'evidence';
   if (rowKind === 'sourcemap' || rowKind === 'mapping' || rowKind === 'sourceMapMapping') return 'sourceMap';
   if (rowKind === 'candidate') return 'mergeCandidate';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.83",
+  "version": "0.3.84",
   "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/source-syntax-family-summary-smoke.mjs && node test/resource-graph-source-syntax-smoke.mjs && node test/tgt-source-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/gate-admission-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/view-source-syntax-smoke.mjs && node test/resource-graph-smoke.mjs && node test/machine-graph-smoke.mjs && node test/interlingua-smoke.mjs && node test/dialect-registry-smoke.mjs",
+    "test": "npm run build && node test/smoke.mjs && node test/source-syntax-family-summary-smoke.mjs && node test/resource-graph-source-syntax-smoke.mjs && node test/tgt-source-smoke.mjs && node test/native-source-rows-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/gate-admission-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/view-source-syntax-smoke.mjs && node test/resource-graph-smoke.mjs && node test/machine-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",