@shapeshift-labs/frontier-lang-compiler 0.2.84 → 0.2.85

package/README.md

@@ -933,7 +933,6 @@ The published Frontier package family is generated from one shared package catal
 - [`@shapeshift-labs/frontier-realtime-server`](https://www.npmjs.com/package/@shapeshift-labs/frontier-realtime-server): Authoritative realtime room, tick, command validation, rate-limit, session, and snapshot-history runtime.
 - [`@shapeshift-labs/frontier-realtime-websocket`](https://www.npmjs.com/package/@shapeshift-labs/frontier-realtime-websocket): WebSocket client, wire, and Node room-server transport for Frontier realtime.
 - [`@shapeshift-labs/frontier-game`](https://www.npmjs.com/package/@shapeshift-labs/frontier-game): Game-facing entity, component, player, room, ownership, spatial interest, rollback, physics, and replication helpers above realtime.
-- [`@shapeshift-labs/loom`](https://www.npmjs.com/package/@shapeshift-labs/loom): Repo-level semantic collaboration CLI for .loom workspaces, including init, scan, status, graph snapshots, projection plans, Frontier Lang delegation, Frontier Swarm delegation, and Frontier Framework delegation.
 
 Package source repositories:
 
@@ -1027,4 +1026,3 @@ Package source repositories:
 - [`siliconjungle/-shapeshift-labs-frontier-realtime-server`](https://github.com/siliconjungle/-shapeshift-labs-frontier-realtime-server)
 - [`siliconjungle/-shapeshift-labs-frontier-realtime-websocket`](https://github.com/siliconjungle/-shapeshift-labs-frontier-realtime-websocket)
 - [`siliconjungle/-shapeshift-labs-frontier-game`](https://github.com/siliconjungle/-shapeshift-labs-frontier-game)
-- [`siliconjungle/-shapeshift-labs-loom`](https://github.com/siliconjungle/-shapeshift-labs-loom)

package/dist/declarations/semantic-edit-script.d.ts

@@ -40,6 +40,10 @@ export interface SemanticEditScriptOperation {
     readonly symbolKind?: string;
     readonly sourceSpan?: SourceSpan;
   };
+  readonly semanticKey?: string;
+  readonly semanticIdentityHash?: string;
+  readonly sourceIdentityHash?: string;
+  readonly operationContentHash?: string;
   readonly spans?: {
     readonly base?: SourceSpan;
     readonly worker?: SourceSpan;
@@ -84,6 +88,10 @@ export interface SemanticEditScriptSummary {
   readonly blocked: number;
   readonly candidates: number;
   readonly autoMergeCandidates: number;
+  readonly semanticKeys?: readonly string[];
+  readonly semanticIdentityHashes?: readonly string[];
+  readonly sourceIdentityHashes?: readonly string[];
+  readonly operationContentHashes?: readonly string[];
 }
 
 export interface SemanticEditScriptAdmission {
@@ -136,6 +144,7 @@ export interface SemanticEditProjectionEdit {
   readonly semanticKey?: string;
   readonly semanticIdentityHash?: string;
   readonly sourceIdentityHash?: string;
+  readonly operationContentHash?: string;
   readonly editContentHash?: string;
   readonly headStart: number;
   readonly headEnd: number;

package/dist/internal/index-impl/projectSemanticEditScriptToSource.js

@@ -1,5 +1,6 @@
 import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { idFragment, uniqueStrings } from '../../native-import-utils.js';
+import { semanticEditIdentityFields } from './semanticEditIdentityRecords.js';
 
 export function projectSemanticEditScriptToSource(input = {}) {
   const script = input.script;
@@ -91,9 +92,7 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
 function projectionEditRecord(edit) {
   const deletedTextHash = hashSemanticValue(edit.current);
   const replacementTextHash = hashSemanticValue(edit.replacement);
-  const semanticKey = semanticEditKey(edit);
-  const semanticIdentityHash = hashSemanticValue(semanticIdentityRecord(edit, semanticKey));
-  const sourceIdentityHash = hashSemanticValue(sourceIdentityRecord(edit));
+  const identity = semanticEditIdentityFields(edit);
   return compactRecord({
     operationId: edit.operationId,
     status: edit.alreadyApplied ? 'already-applied' : 'applied',
@@ -107,11 +106,10 @@ function projectionEditRecord(edit) {
     symbolId: edit.symbolId,
     symbolName: edit.symbolName,
     symbolKind: edit.symbolKind,
-    semanticKey,
-    semanticIdentityHash,
-    sourceIdentityHash,
+    ...identity,
+    operationContentHash: edit.operationContentHash,
     editContentHash: hashSemanticValue(compactRecord({
-      semanticIdentityHash,
+      semanticIdentityHash: identity.semanticIdentityHash,
       deletedTextHash,
       replacementTextHash,
       status: edit.alreadyApplied ? 'already-applied' : 'applied'
@@ -128,35 +126,6 @@ function projectionEditRecord(edit) {
   });
 }
 
-function semanticEditKey(edit) {
-  const scope = edit.symbolName
-    ? `${edit.symbolKind ?? 'symbol'}:${edit.symbolName}`
-    : edit.anchorKey ?? edit.regionId ?? edit.operationId;
-  return ['semantic-edit', edit.kind ?? 'region', edit.changeKind ?? 'change', scope].filter(Boolean).join(':');
-}
-
-function semanticIdentityRecord(edit, semanticKey) {
-  return compactRecord({
-    semanticKey,
-    kind: edit.kind,
-    changeKind: edit.changeKind,
-    regionKind: edit.regionKind,
-    symbolName: edit.symbolName,
-    symbolKind: edit.symbolKind
-  });
-}
-
-function sourceIdentityRecord(edit) {
-  return compactRecord({
-    anchorKey: edit.anchorKey,
-    conflictKey: edit.conflictKey,
-    regionId: edit.regionId,
-    sourcePath: edit.sourcePath,
-    symbolId: edit.symbolId,
-    semanticKey: semanticEditKey(edit)
-  });
-}
-
 function semanticEditIdentity(operation) {
   const anchor = operation.anchor ?? {};
   return compactRecord({
@@ -169,7 +138,11 @@ function semanticEditIdentity(operation) {
     sourcePath: anchor.sourcePath,
     symbolId: anchor.symbolId,
     symbolName: anchor.symbolName,
-    symbolKind: anchor.symbolKind
+    symbolKind: anchor.symbolKind,
+    semanticKey: operation.semanticKey,
+    semanticIdentityHash: operation.semanticIdentityHash,
+    sourceIdentityHash: operation.sourceIdentityHash,
+    operationContentHash: operation.operationContentHash
   });
 }
 

package/dist/internal/index-impl/semanticEditIdentityRecords.js

@@ -0,0 +1,54 @@
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
+
+export function semanticEditIdentityFields(record) {
+  const semanticKey = record.semanticKey ?? semanticEditKey(record);
+  return compactRecord({
+    semanticKey,
+    semanticIdentityHash: record.semanticIdentityHash ?? hashSemanticValue(semanticIdentityRecord(record, semanticKey)),
+    sourceIdentityHash: record.sourceIdentityHash ?? hashSemanticValue(sourceIdentityRecord(record, semanticKey))
+  });
+}
+
+export function semanticEditOperationContentHash(record) {
+  const semanticIdentityHash = record.semanticIdentityHash ?? semanticEditIdentityFields(record).semanticIdentityHash;
+  return hashSemanticValue(compactRecord({
+    semanticIdentityHash,
+    baseTextHash: record.baseTextHash,
+    workerTextHash: record.workerTextHash,
+    headTextHash: record.headTextHash,
+    status: record.status
+  }));
+}
+
+export function semanticEditKey(record) {
+  const scope = record.symbolName
+    ? `${record.symbolKind ?? 'symbol'}:${record.symbolName}`
+    : record.anchorKey ?? record.regionId ?? record.operationId ?? record.id;
+  return ['semantic-edit', record.kind ?? 'region', record.changeKind ?? 'change', scope].filter(Boolean).join(':');
+}
+
+function semanticIdentityRecord(record, semanticKey) {
+  return compactRecord({
+    semanticKey,
+    kind: record.kind,
+    changeKind: record.changeKind,
+    regionKind: record.regionKind,
+    symbolName: record.symbolName,
+    symbolKind: record.symbolKind
+  });
+}
+
+function sourceIdentityRecord(record, semanticKey) {
+  return compactRecord({
+    anchorKey: record.anchorKey,
+    conflictKey: record.conflictKey,
+    regionId: record.regionId,
+    sourcePath: record.sourcePath,
+    symbolId: record.symbolId,
+    semanticKey
+  });
+}
+
+function compactRecord(value) {
+  return Object.fromEntries(Object.entries(value ?? {}).filter(([, entry]) => entry !== undefined && (!Array.isArray(entry) || entry.length > 0)));
+}

package/dist/internal/index-impl/semanticEditScriptClassification.js

@@ -44,7 +44,11 @@ export function summarizeSemanticEditOperations(operations) {
     stale: byStatus.stale ?? 0,
     blocked: byStatus.blocked ?? 0,
     candidates: byStatus.candidate ?? 0,
-    autoMergeCandidates: (byStatus.portable ?? 0) + (byStatus['already-applied'] ?? 0)
+    autoMergeCandidates: (byStatus.portable ?? 0) + (byStatus['already-applied'] ?? 0),
+    semanticKeys: uniqueStrings(operations.map((operation) => operation.semanticKey).filter(Boolean)),
+    semanticIdentityHashes: uniqueStrings(operations.map((operation) => operation.semanticIdentityHash).filter(Boolean)),
+    sourceIdentityHashes: uniqueStrings(operations.map((operation) => operation.sourceIdentityHash).filter(Boolean)),
+    operationContentHashes: uniqueStrings(operations.map((operation) => operation.operationContentHash).filter(Boolean))
   };
 }
 

package/dist/internal/index-impl/semanticEditScripts.js

@@ -13,6 +13,7 @@ import {
   summarizeSemanticEditOperations
 } from './semanticEditScriptClassification.js';
 import { sourceTextForSpan } from './sourceTextForSpan.js';
+import { semanticEditIdentityFields, semanticEditOperationContentHash } from './semanticEditIdentityRecords.js';
 
 export { SemanticEditScriptAdmissionStatuses };
 
@@ -137,42 +138,48 @@ function semanticEditOperation(region, index, context, input) {
   const baseText = spanText(context.base, baseSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.before?.sourceSpan ?? region.sourceSpan);
   const workerText = spanText(context.worker, workerSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.after?.sourceSpan ?? region.sourceSpan);
   const headText = spanText(context.head, headSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.head?.sourceSpan ?? baseSymbol?.sourceSpan);
+  const anchor = compactRecord({
+    key: anchorKey,
+    conflictKey: region.conflictKey ?? `region:${anchorKey}`,
+    regionId: region.id,
+    regionKind: region.regionKind,
+    granularity: region.granularity,
+    language: region.language ?? context.workerChangeSet.language,
+    sourcePath: region.sourcePath ?? context.workerChangeSet.sourcePath,
+    symbolId: region.symbolId ?? workerSymbol?.id ?? baseSymbol?.id,
+    symbolName: region.symbolName ?? workerSymbol?.name ?? baseSymbol?.name,
+    symbolKind: region.symbolKind ?? workerSymbol?.kind ?? baseSymbol?.kind,
+    sourceSpan: workerSymbol?.sourceSpan ?? region.sourceSpan
+  });
+  const hashes = compactRecord({
+    baseSourceHash: context.workerChangeSet.beforeHash,
+    workerSourceHash: context.workerChangeSet.afterHash,
+    headSourceHash: context.headChangeSet?.afterHash,
+    baseSpanHash: baseSymbol?.spanHash,
+    workerSpanHash: workerSymbol?.spanHash,
+    headSpanHash: headSymbol?.spanHash,
+    baseTextHash: baseText === undefined ? undefined : hashSemanticValue(baseText),
+    workerTextHash: workerText === undefined ? undefined : hashSemanticValue(workerText),
+    headTextHash: headText === undefined ? undefined : hashSemanticValue(headText),
+    beforeSignatureHash: workerSymbol?.beforeSignatureHash ?? baseSymbol?.signatureHash,
+    afterSignatureHash: workerSymbol?.afterSignatureHash ?? workerSymbol?.signatureHash
+  });
+  const identityRecord = semanticEditIdentityRecord({ kind, region, anchor });
+  const identity = semanticEditIdentityFields(identityRecord);
   return compactRecord({
     id: `semantic_edit_op_${idFragment(firstString(input.id, anchorKey, index))}`,
     kind,
     changeKind: region.changeKind,
-    anchor: compactRecord({
-      key: anchorKey,
-      conflictKey: region.conflictKey ?? `region:${anchorKey}`,
-      regionId: region.id,
-      regionKind: region.regionKind,
-      granularity: region.granularity,
-      language: region.language ?? context.workerChangeSet.language,
-      sourcePath: region.sourcePath ?? context.workerChangeSet.sourcePath,
-      symbolId: region.symbolId ?? workerSymbol?.id ?? baseSymbol?.id,
-      symbolName: region.symbolName ?? workerSymbol?.name ?? baseSymbol?.name,
-      symbolKind: region.symbolKind ?? workerSymbol?.kind ?? baseSymbol?.kind,
-      sourceSpan: workerSymbol?.sourceSpan ?? region.sourceSpan
-    }),
+    anchor,
+    ...identity,
     spans: compactRecord({
       base: baseSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.before?.sourceSpan,
       worker: workerSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.after?.sourceSpan ?? region.sourceSpan,
       head: headSymbol?.sourceSpan
     }),
-    hashes: compactRecord({
-      baseSourceHash: context.workerChangeSet.beforeHash,
-      workerSourceHash: context.workerChangeSet.afterHash,
-      headSourceHash: context.headChangeSet?.afterHash,
-      baseSpanHash: baseSymbol?.spanHash,
-      workerSpanHash: workerSymbol?.spanHash,
-      headSpanHash: headSymbol?.spanHash,
-      baseTextHash: baseText === undefined ? undefined : hashSemanticValue(baseText),
-      workerTextHash: workerText === undefined ? undefined : hashSemanticValue(workerText),
-      headTextHash: headText === undefined ? undefined : hashSemanticValue(headText),
-      beforeSignatureHash: workerSymbol?.beforeSignatureHash ?? baseSymbol?.signatureHash,
-      afterSignatureHash: workerSymbol?.afterSignatureHash ?? workerSymbol?.signatureHash
-    }),
+    hashes,
     status: classification.status,
+    operationContentHash: semanticEditOperationContentHash({ ...identityRecord, ...identity, ...hashes, status: classification.status }),
     reanchor: classification.reanchor,
     readiness: classification.readiness,
     confidence: classification.confidence,
@@ -185,6 +192,21 @@ function semanticEditOperation(region, index, context, input) {
   });
 }
 
+function semanticEditIdentityRecord(input) {
+  return {
+    kind: input.kind,
+    changeKind: input.region.changeKind,
+    anchorKey: input.anchor.key,
+    conflictKey: input.anchor.conflictKey,
+    regionId: input.anchor.regionId,
+    regionKind: input.anchor.regionKind,
+    sourcePath: input.anchor.sourcePath,
+    symbolId: input.anchor.symbolId,
+    symbolName: input.anchor.symbolName,
+    symbolKind: input.anchor.symbolKind
+  };
+}
+
 function semanticEditOperationKind(region) {
   const prefix = region.changeKind === 'added' ? 'add' : region.changeKind === 'removed' ? 'remove' : 'replace';
   const kind = String(region.regionKind ?? region.granularity ?? 'region');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.84",
+  "version": "0.2.85",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",