@shapeshift-labs/frontier-lang-parser 0.3.78 → 0.3.80

package/dist/source-syntax-children.js

@@ -4,7 +4,7 @@ import { readTypeExpressionSyntaxChildren } from './source-syntax-type-expressio
 import { readViewSyntaxChildren } from './source-syntax-view-children.js';
 import { inspectTypeExpressionSyntax } from './type-expressions.js';
 import { inspectVariantPayload } from './type-variants.js';
-const ROW_NAME_PATTERN = '([A-Za-z_$@./:*+-][\\w$./@:*+-]*)';
+const ROW_NAME_PATTERN = '([^\\s{}]+)';
 
 export function readSourceSyntaxChildren(source, block, options = {}) {
   let children = [];
@@ -277,8 +277,8 @@ function genericUnknownRowChild(source, block, options, line, config, rowKind, n
   });
 }
 
-function unknownGenericRowsFailClosed(config) { return config.childKind === 'gateAdmissionEvidenceRow' || config.childKind === 'machineGraphRow'; }
-function unsupportedGenericRowReason(config) { return config.childKind === 'machineGraphRow' ? 'unsupported-machine-graph-row' : 'unsupported-gate-admission-row'; }
+function unknownGenericRowsFailClosed(config) { return config.failClosedUnknownRows === true; }
+function unsupportedGenericRowReason(config) { return config.unknownRowReason ?? 'unsupported-generic-row'; }
 
 function readBodyLines(source, block) { return readTextLines(source, block.bodyStartOffset, block.bodyEndOffset); }
 

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

@@ -1,13 +1,15 @@
-const appRows = words('mount provide provides required requires require route event asset gate gap proofGap evidence proofEvidence');
+const appRows = words('role sourcePath path sourceHash host hostId mount provide provides required requires require route event asset gate gap proofGap evidence proofEvidence');
 const canvasRows = words('element command state stateWrite trace gap proofGap evidence proofEvidence');
 const constraintRows = words('variable var constraint hard soft preference prefer collapse admission');
 const dialectRows = words('dialect record extern');
 const interlinguaRows = words('layer constraint edge obligation proofObligation proof lowering lower source sourceLift lift evidence');
 const machineRows = words('label directive register reg flag conditionFlag basicBlock block instruction inst instr op opcode operand arg memoryEffect memoryAccess load store atomic fence memory mem effect controlEdge edge branch call return ret interrupt irq exception proof proofObligation obligation gap proofGap evidence proofEvidence');
+const migrationRows = words('from fromVersion to toVersion change invariant invariants');
 const packageRows = words('metadata dependency script export gap proofGap evidence proofEvidence');
 const runtimeRows = words('host runtimeHost hostProfile sourceHost targetHost capability hostCapability hostBinding binding requirement runtimeRequirement requiredRuntime evidence proofEvidence gap proofGap');
 const semanticEditRows = words('script semanticEditScript projection semanticEditProjection replay semanticEditReplay');
 const gateAdmissionRows = words('gate evidence proofEvidence admission admissionDecision proofObligation obligation gap proofGap');
+const coreFailClosed = (reason) => ({ failClosedUnknownRows: true, unknownRowReason: reason });
 
 export const ROW_SYNTAX_CONFIG = Object.freeze({
   interlingua: rowConfig('interlinguaRow', 'interlingua_row', interlinguaRows, normalizeInterlinguaRow),
@@ -19,14 +21,19 @@ export const ROW_SYNTAX_CONFIG = Object.freeze({
   runtimeHosts: rowConfig('runtimeCapabilityRow', 'runtime_capability_row', runtimeRows, normalizeRuntimeCapabilityRow),
   resourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('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 hb fence fenceEdge barrier barrierEdge trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
   semanticResourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('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 hb fence fenceEdge barrier barrierEdge trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
-  machineGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow),
-  executionGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow),
-  lowLevelGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow),
-  applicationSurface: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
-  appHost: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
-  plugin: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
-  pluginSurface: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
-  pluginContract: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
+  machineGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow, coreFailClosed('unsupported-machine-graph-row')),
+  executionGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow, coreFailClosed('unsupported-machine-graph-row')),
+  lowLevelGraph: rowConfig('machineGraphRow', 'machine_graph_row', machineRows, normalizeMachineGraphRow, coreFailClosed('unsupported-machine-graph-row')),
+  migration: rowConfig('migrationRow', 'migration_row', migrationRows, normalizeMigrationRow, coreFailClosed('unsupported-migration-row')),
+  capability: rowConfig('capabilityRow', 'capability_row', words('capability category input returns effects resources adapter unsupported unsupportedTarget'), normalizeCapabilityRow, coreFailClosed('unsupported-capability-row')),
+  effect: rowConfig('effectRow', 'effect_row', words('capability input returns resources'), undefined, coreFailClosed('unsupported-effect-row')),
+  extern: rowConfig('externRow', 'extern_row', words('language target symbol input returns effects uses resources'), normalizeExternRow, coreFailClosed('unsupported-extern-row')),
+  lattice: rowConfig('latticeRow', 'lattice_row', words('carrier law laws frontierCrdt frontier-crdt lawChecker'), normalizeLatticeRow, coreFailClosed('unsupported-lattice-row')),
+  applicationSurface: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow, coreFailClosed('unsupported-application-surface-row')),
+  appHost: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow, coreFailClosed('unsupported-application-surface-row')),
+  plugin: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow, coreFailClosed('unsupported-application-surface-row')),
+  pluginSurface: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow, coreFailClosed('unsupported-application-surface-row')),
+  pluginContract: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow, coreFailClosed('unsupported-application-surface-row')),
   target: rowConfig('targetProjectionRow', 'target_projection_row', words('projection lowering layer')),
   packageManifest: rowConfig('packageManifestRow', 'package_manifest_row', packageRows, normalizeProofEvidenceRows),
   packageGraph: rowConfig('packageManifestRow', 'package_manifest_row', packageRows, normalizeProofEvidenceRows),
@@ -37,9 +44,9 @@ export const ROW_SYNTAX_CONFIG = Object.freeze({
   possibilitySpace: rowConfig('constraintSpaceRow', 'constraint_space_row', constraintRows, normalizeConstraintSpaceRow),
   decisionGraph: rowConfig('decisionGraphRow', 'decision_graph_row', words('node edge chunk gate evidence semanticChange change patchEvent patch admissionDecision admission candidateDecision candidate mergeDecision merge replay tournament tournamentCandidate panelProjection panel rsiLoop improvementFeedback feedback'), normalizeDecisionGraphRow),
   admissionGraph: rowConfig('decisionGraphRow', 'decision_graph_row', words('node edge chunk gate evidence semanticChange change patchEvent patch admissionDecision admission candidateDecision candidate mergeDecision merge replay tournament tournamentCandidate panelProjection panel rsiLoop improvementFeedback feedback'), normalizeDecisionGraphRow),
-  gateEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow),
-  admissionEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow),
-  routeEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow),
+  gateEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow, coreFailClosed('unsupported-gate-admission-row')),
+  admissionEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow, coreFailClosed('unsupported-gate-admission-row')),
+  routeEvidence: rowConfig('gateAdmissionEvidenceRow', 'gate_admission_evidence_row', gateAdmissionRows, normalizeGateAdmissionRow, coreFailClosed('unsupported-gate-admission-row')),
   operations: rowConfig('semanticOperationRow', 'semantic_operation_row', words('operation op'), normalizeOperationRow),
   semanticOperations: rowConfig('semanticOperationRow', 'semantic_operation_row', words('operation op'), normalizeOperationRow),
   semanticEdits: rowConfig('semanticEditRecordRow', 'semantic_edit_record_row', semanticEditRows, normalizeSemanticEditRow),
@@ -50,8 +57,8 @@ export const ROW_SYNTAX_CONFIG = Object.freeze({
   nativeSource: rowConfig('nativeSourceRow', 'native_source_row', words('loss evidence proofEvidence sourceMap sourcemap mapping sourceMapMapping mergeCandidate candidate'), normalizeNativeSourceRow)
 });
 
-function rowConfig(childKind, idPrefix, rowKinds, normalize) {
-  return { childKind, idPrefix, rowKinds: new Set(rowKinds), normalize };
+function rowConfig(childKind, idPrefix, rowKinds, normalize, options = {}) {
+  return { childKind, idPrefix, rowKinds: new Set(rowKinds), normalize, ...options };
 }
 
 function words(source) { return source.split(/\s+/); }
@@ -111,7 +118,33 @@ function normalizeMachineGraphRow(rowKind) {
   return rowKind;
 }
 
+function normalizeMigrationRow(rowKind) {
+  if (rowKind === 'from') return 'fromVersion';
+  if (rowKind === 'to') return 'toVersion';
+  if (rowKind === 'invariant') return 'invariants';
+  return rowKind;
+}
+
+function normalizeCapabilityRow(rowKind) {
+  if (rowKind === 'unsupported') return 'unsupportedTarget';
+  return rowKind;
+}
+
+function normalizeExternRow(rowKind) {
+  if (rowKind === 'target') return 'language';
+  if (rowKind === 'uses') return 'effects';
+  return rowKind;
+}
+
+function normalizeLatticeRow(rowKind) {
+  if (rowKind === 'law') return 'laws';
+  if (rowKind === 'frontier-crdt') return 'frontierCrdt';
+  return rowKind;
+}
+
 function normalizeApplicationSurfaceRow(rowKind) {
+  if (rowKind === 'path') return 'sourcePath';
+  if (rowKind === 'hostId') return 'host';
   if (rowKind === 'provide' || rowKind === 'provides') return 'provided-surface';
   if (rowKind === 'required' || rowKind === 'requires' || rowKind === 'require') return 'required-capability';
   if (rowKind === 'proofEvidence') return 'evidence';

package/package.json

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