@shapeshift-labs/frontier-lang-compiler 0.2.80 → 0.2.82

package/README.md

@@ -933,6 +933,7 @@ 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:
 
@@ -1026,3 +1027,4 @@ 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,11 @@ export interface SemanticEditScriptOperation {
     readonly symbolKind?: string;
     readonly sourceSpan?: SourceSpan;
   };
+  readonly spans?: {
+    readonly base?: SourceSpan;
+    readonly worker?: SourceSpan;
+    readonly head?: SourceSpan;
+  };
   readonly hashes?: {
     readonly baseSourceHash?: string;
     readonly workerSourceHash?: string;
@@ -49,6 +54,7 @@ export interface SemanticEditScriptOperation {
     readonly headSpanHash?: string;
     readonly baseTextHash?: string;
     readonly workerTextHash?: string;
+    readonly headTextHash?: string;
     readonly beforeSignatureHash?: string;
     readonly afterSignatureHash?: string;
   };
@@ -114,6 +120,54 @@ export interface SemanticEditScript {
   readonly metadata?: Record<string, unknown>;
 }
 
+export interface SemanticEditProjectionEdit {
+  readonly operationId?: string;
+  readonly status: 'applied' | 'already-applied';
+  readonly headStart: number;
+  readonly headEnd: number;
+  readonly workerStart?: number;
+  readonly workerEnd?: number;
+  readonly deletedBytes: number;
+  readonly replacementBytes: number;
+  readonly deletedTextHash?: string;
+  readonly replacementTextHash?: string;
+  readonly replacementText?: string;
+}
+
+export interface SemanticEditProjection {
+  readonly kind: 'frontier.lang.semanticEditProjection';
+  readonly version: 1;
+  readonly id: string;
+  readonly hash: string;
+  readonly scriptId?: string;
+  readonly status: 'projected' | 'blocked';
+  readonly sourcePath?: string;
+  readonly language?: FrontierSourceLanguage | string;
+  readonly baseHash?: string;
+  readonly workerHash?: string;
+  readonly headHash?: string;
+  readonly projectedHash?: string;
+  readonly appliedOperations: readonly string[];
+  readonly skippedOperations: readonly string[];
+  readonly edits: readonly SemanticEditProjectionEdit[];
+  readonly sourceText?: string;
+  readonly admission: {
+    readonly status: 'auto-merge-candidate' | 'blocked';
+    readonly autoMergeClaim: false;
+    readonly semanticEquivalenceClaim: false;
+    readonly reasonCodes: readonly string[];
+  };
+  readonly metadata?: Record<string, unknown>;
+}
+
+export interface ProjectSemanticEditScriptToSourceOptions {
+  readonly id?: string;
+  readonly script: SemanticEditScript;
+  readonly workerSourceText: string;
+  readonly headSourceText: string;
+  readonly metadata?: Record<string, unknown>;
+}
+
 export interface CreateSemanticEditScriptOptions {
   readonly id?: string;
   readonly language?: FrontierSourceLanguage | string;
@@ -141,3 +195,4 @@ export interface CreateSemanticEditScriptOptions {
 
 export declare const SemanticEditScriptAdmissionStatuses: readonly SemanticEditScriptAdmissionStatus[];
 export declare function createSemanticEditScript(input?: CreateSemanticEditScriptOptions): SemanticEditScript;
+export declare function projectSemanticEditScriptToSource(input: ProjectSemanticEditScriptToSourceOptions): SemanticEditProjection;

package/dist/index.js

@@ -70,6 +70,7 @@ export { createSemanticPatchBundleRecord, querySemanticPatchBundleRecords, Seman
 export { createSemanticMergeCandidateAdmissionRecord, decorateSemanticMergeCandidateForAdmission, querySemanticMergeCandidateAdmissionOverlaps, SemanticMergeCandidateProjectionRisks, semanticMergeCandidateReadinessSortKey, sortSemanticMergeCandidateAdmissionRecords } from './internal/index-impl/semanticMergeCandidateRecords.js';
 export { querySemanticMergeConflictClasses, SemanticMergeConflictClasses, semanticMergeConflictRiskScore, sortSemanticMergeCandidatesByConflictRisk, summarizeSemanticMergeConflicts } from './internal/index-impl/semanticMergeConflicts.js';
 export { createSemanticEditScript, SemanticEditScriptAdmissionStatuses } from './internal/index-impl/semanticEditScripts.js';
+export { projectSemanticEditScriptToSource } from './internal/index-impl/projectSemanticEditScriptToSource.js';
 export { queryUniversalConversionPlan } from './internal/index-impl/queryUniversalConversionPlan.js';
 export { createSemanticAnchor, createSemanticLineageEvent, createSemanticLineageMap, querySemanticLineageEvents, SemanticLineageEventKinds } from './internal/index-impl/semanticLineageRecords.js';
 export { resolveSemanticLineage, resolveSemanticLineageBatch, SemanticLineageResolutionStatuses } from './internal/index-impl/semanticLineageResolutionRecords.js';

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

@@ -0,0 +1,131 @@
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
+import { idFragment, uniqueStrings } from '../../native-import-utils.js';
+
+export function projectSemanticEditScriptToSource(input = {}) {
+  const script = input.script;
+  const workerSourceText = input.workerSourceText;
+  const headSourceText = input.headSourceText;
+  const reasonCodes = [];
+  if (!script) throw new Error('projectSemanticEditScriptToSource requires a script');
+  if (script.admission?.status !== 'auto-merge-candidate') reasonCodes.push('script-not-auto-merge-candidate');
+  if (typeof workerSourceText !== 'string') reasonCodes.push('missing-worker-source-text');
+  if (typeof headSourceText !== 'string') reasonCodes.push('missing-head-source-text');
+  const edits = [];
+  for (const operation of script.operations ?? []) {
+    const edit = sourceEditForOperation(operation, workerSourceText, headSourceText);
+    if (edit.ok) edits.push(edit.value);
+    else reasonCodes.push(...edit.reasonCodes);
+  }
+  const blocked = reasonCodes.length > 0;
+  const sourceText = blocked ? undefined : applySourceEdits(headSourceText, edits);
+  const core = {
+    kind: 'frontier.lang.semanticEditProjection',
+    version: 1,
+    id: input.id ?? `semantic_edit_projection_${idFragment(script.id ?? script.hash ?? 'script')}`,
+    scriptId: script.id,
+    status: blocked ? 'blocked' : 'projected',
+    sourcePath: script.sourcePath,
+    language: script.language,
+    baseHash: script.baseHash,
+    workerHash: script.workerHash,
+    headHash: script.headHash,
+    projectedHash: sourceText === undefined ? undefined : hashSemanticValue(sourceText),
+    appliedOperations: blocked ? [] : edits.map((edit) => edit.operationId),
+    skippedOperations: blocked ? (script.operations ?? []).map((operation) => operation.id) : [],
+    edits: blocked ? [] : edits.map(projectionEditRecord),
+    sourceText,
+    admission: {
+      status: blocked ? 'blocked' : 'auto-merge-candidate',
+      autoMergeClaim: false,
+      semanticEquivalenceClaim: false,
+      reasonCodes: uniqueStrings(reasonCodes)
+    },
+    metadata: compactRecord({
+      autoMergeClaim: false,
+      semanticEquivalenceClaim: false,
+      editCount: edits.length,
+      appliedEditCount: edits.filter((edit) => !edit.alreadyApplied).length,
+      alreadyAppliedEditCount: edits.filter((edit) => edit.alreadyApplied).length,
+      ...input.metadata
+    })
+  };
+  return { ...core, hash: hashSemanticValue(core) };
+}
+
+function sourceEditForOperation(operation, workerSourceText, headSourceText) {
+  if (operation.status === 'already-applied') {
+    return { ok: true, value: { operationId: operation.id, start: 0, end: 0, replacement: '', current: '', alreadyApplied: true } };
+  }
+  if (operation.status !== 'portable') return { ok: false, reasonCodes: [`operation-not-portable:${operation.id}`] };
+  const workerOffsets = spanOffsets(workerSourceText, operation.spans?.worker);
+  const headOffsets = spanOffsets(headSourceText, operation.spans?.head ?? operation.spans?.base ?? operation.anchor?.sourceSpan);
+  const reasons = [];
+  if (!workerOffsets) reasons.push(`worker-span-not-resolvable:${operation.id}`);
+  if (!headOffsets) reasons.push(`head-span-not-resolvable:${operation.id}`);
+  if (reasons.length) return { ok: false, reasonCodes: reasons };
+  const replacement = workerSourceText.slice(workerOffsets.start, workerOffsets.end);
+  const current = headSourceText.slice(headOffsets.start, headOffsets.end);
+  if (operation.hashes?.workerTextHash && hashSemanticValue(replacement) !== operation.hashes.workerTextHash) {
+    reasons.push(`worker-span-hash-mismatch:${operation.id}`);
+  }
+  const expectedHeadHash = operation.hashes?.headTextHash ?? operation.hashes?.baseTextHash;
+  if (expectedHeadHash && hashSemanticValue(current) !== expectedHeadHash) {
+    reasons.push(`head-span-hash-mismatch:${operation.id}`);
+  }
+  if (reasons.length) return { ok: false, reasonCodes: reasons };
+  return {
+    ok: true,
+    value: {
+      operationId: operation.id,
+      start: headOffsets.start,
+      end: headOffsets.end,
+      workerStart: workerOffsets.start,
+      workerEnd: workerOffsets.end,
+      replacement,
+      current
+    }
+  };
+}
+
+function projectionEditRecord(edit) {
+  return compactRecord({
+    operationId: edit.operationId,
+    status: edit.alreadyApplied ? 'already-applied' : 'applied',
+    headStart: edit.start,
+    headEnd: edit.end,
+    workerStart: edit.workerStart,
+    workerEnd: edit.workerEnd,
+    deletedBytes: edit.current.length,
+    replacementBytes: edit.replacement.length,
+    deletedTextHash: hashSemanticValue(edit.current),
+    replacementTextHash: hashSemanticValue(edit.replacement),
+    replacementText: edit.replacement
+  });
+}
+
+function applySourceEdits(sourceText, edits) {
+  return edits.filter((edit) => !edit.alreadyApplied)
+    .sort((left, right) => right.start - left.start)
+    .reduce((text, edit) => text.slice(0, edit.start) + edit.replacement + text.slice(edit.end), sourceText);
+}
+
+function spanOffsets(sourceText, span) {
+  if (typeof sourceText !== 'string' || !span) return undefined;
+  if (typeof span.start === 'number' && typeof span.end === 'number' && span.end >= span.start) return { start: span.start, end: span.end };
+  if (typeof span.startLine !== 'number') return undefined;
+  const lineStarts = [0];
+  for (let index = 0; index < sourceText.length; index += 1) if (sourceText[index] === '\n') lineStarts.push(index + 1);
+  const startLine = Math.max(1, span.startLine);
+  const endLine = Math.max(startLine, typeof span.endLine === 'number' ? span.endLine : startLine);
+  const start = lineStarts[startLine - 1];
+  const endLineStart = lineStarts[endLine - 1];
+  if (start === undefined || endLineStart === undefined) return undefined;
+  const startColumn = Math.max(1, span.startColumn ?? 1) - 1;
+  const lineEnd = lineStarts[endLine] === undefined ? sourceText.length : lineStarts[endLine] - 1;
+  const endColumn = span.endColumn === undefined ? lineEnd - endLineStart : Math.max(1, span.endColumn) - 1;
+  return { start: start + startColumn, end: endLineStart + endColumn };
+}
+
+function compactRecord(value) {
+  return Object.fromEntries(Object.entries(value ?? {}).filter(([, entry]) => entry !== undefined && (!Array.isArray(entry) || entry.length > 0)));
+}

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

@@ -136,6 +136,7 @@ function semanticEditOperation(region, index, context, input) {
   const kind = semanticEditOperationKind(region);
   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);
   return compactRecord({
     id: `semantic_edit_op_${idFragment(firstString(input.id, anchorKey, index))}`,
     kind,
@@ -153,6 +154,11 @@ function semanticEditOperation(region, index, context, input) {
       symbolKind: region.symbolKind ?? workerSymbol?.kind ?? baseSymbol?.kind,
       sourceSpan: workerSymbol?.sourceSpan ?? region.sourceSpan
     }),
+    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,
@@ -162,6 +168,7 @@ function semanticEditOperation(region, index, context, input) {
       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
     }),

package/package.json

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