@shapeshift-labs/frontier-lang-css 0.1.6 → 0.1.7

package/dist/index.d.ts

@@ -273,40 +273,35 @@ export interface CssSafeMergeResult {
   readonly headChangedDeclarations?: number;
   readonly workerChangedCssModuleContracts?: number;
   readonly headChangedCssModuleContracts?: number;
+  readonly parserEvidence?: CssSafeMergeParserEvidence;
+}
+
+export interface CssSafeMergeParserEvidence {
+  readonly kind: 'frontier.lang.cssSafeMergeParserEvidence';
+  readonly version: 1;
+  readonly parserNames: readonly string[];
+  readonly sourceCodeLocationInfo: boolean; readonly parserBackedSourceSpans: boolean; readonly parserBackedDeclarationSpans: boolean; readonly parserBackedTriviaHashes: boolean;
+  readonly scopedCascadeGraphHashPresent: boolean; readonly parseErrors: number;
+  readonly sides: Readonly<Record<string, CssSafeMergeParserSideEvidence>>;
+}
+
+export interface CssSafeMergeParserSideEvidence {
+  readonly parserName: string;
+  readonly sourceCodeLocationInfo: boolean; readonly parserBackedSourceSpans: boolean; readonly parserBackedDeclarationSpans: boolean; readonly parserBackedTriviaHashes: boolean;
+  readonly scopedCascadeGraphHashPresent: boolean; readonly parseErrors: number; readonly recordCount: number; readonly declarationCount: number;
 }
 
 export interface CssSafeMergeInput {
-  readonly id?: string;
-  readonly sourcePath?: string;
-  readonly baseSourceText?: string;
-  readonly workerSourceText?: string;
-  readonly headSourceText?: string;
-  readonly cssModule?: boolean;
-  readonly cssModules?: boolean;
+  readonly id?: string; readonly sourcePath?: string; readonly baseSourceText?: string; readonly workerSourceText?: string; readonly headSourceText?: string;
+  readonly cssModule?: boolean; readonly cssModules?: boolean;
   readonly generatedClassNameMap?: Readonly<Record<string, string>>;
-  readonly generatedClassNameMapHash?: string;
-  readonly jsTsUseSiteGraphHash?: string;
-  readonly cssModuleCompositionGraphHash?: string;
-  readonly icssGraphHash?: string;
-  readonly scopedCascadeGraphHash?: string;
-  readonly baseGeneratedClassNameMap?: Readonly<Record<string, string>>;
-  readonly workerGeneratedClassNameMap?: Readonly<Record<string, string>>;
-  readonly headGeneratedClassNameMap?: Readonly<Record<string, string>>;
-  readonly baseGeneratedClassNameMapHash?: string;
-  readonly workerGeneratedClassNameMapHash?: string;
-  readonly headGeneratedClassNameMapHash?: string;
-  readonly baseJsTsUseSiteGraphHash?: string;
-  readonly workerJsTsUseSiteGraphHash?: string;
-  readonly headJsTsUseSiteGraphHash?: string;
-  readonly baseCssModuleCompositionGraphHash?: string;
-  readonly workerCssModuleCompositionGraphHash?: string;
-  readonly headCssModuleCompositionGraphHash?: string;
-  readonly baseIcssGraphHash?: string;
-  readonly workerIcssGraphHash?: string;
-  readonly headIcssGraphHash?: string;
-  readonly baseScopedCascadeGraphHash?: string;
-  readonly workerScopedCascadeGraphHash?: string;
-  readonly headScopedCascadeGraphHash?: string;
+  readonly generatedClassNameMapHash?: string; readonly jsTsUseSiteGraphHash?: string; readonly cssModuleCompositionGraphHash?: string; readonly icssGraphHash?: string; readonly scopedCascadeGraphHash?: string;
+  readonly baseGeneratedClassNameMap?: Readonly<Record<string, string>>; readonly workerGeneratedClassNameMap?: Readonly<Record<string, string>>; readonly headGeneratedClassNameMap?: Readonly<Record<string, string>>;
+  readonly baseGeneratedClassNameMapHash?: string; readonly workerGeneratedClassNameMapHash?: string; readonly headGeneratedClassNameMapHash?: string;
+  readonly baseJsTsUseSiteGraphHash?: string; readonly workerJsTsUseSiteGraphHash?: string; readonly headJsTsUseSiteGraphHash?: string;
+  readonly baseCssModuleCompositionGraphHash?: string; readonly workerCssModuleCompositionGraphHash?: string; readonly headCssModuleCompositionGraphHash?: string;
+  readonly baseIcssGraphHash?: string; readonly workerIcssGraphHash?: string; readonly headIcssGraphHash?: string;
+  readonly baseScopedCascadeGraphHash?: string; readonly workerScopedCascadeGraphHash?: string; readonly headScopedCascadeGraphHash?: string;
 }
 
 export declare function toCssAst(document: FrontierLangDocument, options?: CssProjectionOptions): CssAstStylesheet;

package/dist/semantic-merge.js

@@ -30,7 +30,8 @@ function safeMergeCssSource(input = {}, context = {}) {
   const moduleConflicts = cssModuleContractConflicts(id, sourcePath, moduleChanges);
   const sourceShapeConflicts = unsupportedSourceShapeConflicts(id, sourcePath, sheets, changed, hash);
   const conflicts = [...parserConflicts, ...proofConflicts, ...overlapConflicts, ...moduleConflicts, ...sourceShapeConflicts];
-  if (conflicts.length) return blocked(id, sourcePath, 'css-semantic-merge-conflict', conflicts);
+  const parserEvidence = mergeParserEvidence(sheets);
+  if (conflicts.length) return blocked(id, sourcePath, 'css-semantic-merge-conflict', conflicts, { parserEvidence });
   const mergedIndex = applyDeclarationChanges(applyDeclarationChanges(indexes.base, changed.head), changed.worker);
   return merged(id, sourcePath, renderDeclarationIndex(mergedIndex), 'semantic-declaration-merge', hash, {
     baseSheetHash: sheets.base.sheetHash,
@@ -39,7 +40,8 @@ function safeMergeCssSource(input = {}, context = {}) {
     workerChangedDeclarations: changed.worker.length,
     headChangedDeclarations: changed.head.length,
     workerChangedCssModuleContracts: moduleChanges.worker.length,
-    headChangedCssModuleContracts: moduleChanges.head.length
+    headChangedCssModuleContracts: moduleChanges.head.length,
+    parserEvidence
   });
 }
 
@@ -107,6 +109,38 @@ function parserErrorConflicts(id, sourcePath, sheets) {
     .map((gap) => conflict(id, sourcePath, 'css-parser-error-blocked', gap.code, { side, proofGap: gap })));
 }
 
+function mergeParserEvidence(sheets) {
+  const entries = Object.entries(sheets).map(([side, sheet]) => [side, sheetParserEvidence(sheet)]);
+  return {
+    kind: 'frontier.lang.cssSafeMergeParserEvidence',
+    version: 1,
+    parserNames: unique(entries.map(([, evidence]) => evidence.parserName)),
+    sourceCodeLocationInfo: entries.every(([, evidence]) => evidence.sourceCodeLocationInfo === true),
+    parserBackedSourceSpans: entries.every(([, evidence]) => evidence.parserBackedSourceSpans === true),
+    parserBackedDeclarationSpans: entries.every(([, evidence]) => evidence.parserBackedDeclarationSpans === true),
+    parserBackedTriviaHashes: entries.every(([, evidence]) => evidence.parserBackedTriviaHashes === true),
+    scopedCascadeGraphHashPresent: entries.every(([, evidence]) => evidence.scopedCascadeGraphHashPresent === true),
+    parseErrors: entries.reduce((sum, [, evidence]) => sum + evidence.parseErrors, 0),
+    sides: Object.fromEntries(entries)
+  };
+}
+
+function sheetParserEvidence(sheet) {
+  const records = sheet.records ?? [];
+  const declarations = records.flatMap((record) => record.declarations ?? []);
+  return {
+    parserName: sheet.parser?.name ?? 'unknown',
+    sourceCodeLocationInfo: sheet.parser?.sourceCodeLocationInfo === true,
+    parserBackedSourceSpans: records.some((record) => record.parser === 'postcss' && record.sourceSpan?.startOffset !== undefined),
+    parserBackedDeclarationSpans: declarations.some((declaration) => declaration.sourceSpan?.startOffset !== undefined),
+    parserBackedTriviaHashes: records.some((record) => record.parser === 'postcss' && typeof record.rawTextHash === 'string'),
+    scopedCascadeGraphHashPresent: records.every((record) => !(record.scopes?.length) || Boolean(record.scopedCascadeGraphHash)),
+    parseErrors: sheet.parser?.parseErrors?.length ?? 0,
+    recordCount: records.length,
+    declarationCount: declarations.length
+  };
+}
+
 function overlapDeclarationConflicts(id, sourcePath, workerChanges, headChanges) {
   const headByKey = new Map(headChanges.map((change) => [change.key, change]));
   return workerChanges.flatMap((workerChange) => {
@@ -217,10 +251,11 @@ function merged(id, sourcePath, sourceText, operation, hash, extra = {}) {
   });
 }
 
-function blocked(id, sourcePath, reasonCode, conflicts = []) {
+function blocked(id, sourcePath, reasonCode, conflicts = [], extra = {}) {
   return result(id, sourcePath, 'blocked', {
     operation: 'blocked',
-    conflicts: conflicts.length ? conflicts : [conflict(id, sourcePath, reasonCode, reasonCode)]
+    conflicts: conflicts.length ? conflicts : [conflict(id, sourcePath, reasonCode, reasonCode)],
+    ...extra
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-css",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "CSS semantic merge evidence and projection adapter for Frontier Lang semantic source documents.",
   "type": "module",
   "main": "./dist/index.js",