@shapeshift-labs/frontier-lang-css 0.1.18 → 0.1.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
function blockedMergeCandidate(input, mergedSourceText, hash) {
|
|
2
|
+
if (input.includeBlockedMergeCandidate !== true && input.includeBlockedMergedSourceText !== true) return {};
|
|
3
|
+
return {
|
|
4
|
+
candidateMergedSourceText: mergedSourceText,
|
|
5
|
+
candidateMergedSourceHash: hash?.(mergedSourceText),
|
|
6
|
+
candidateOperation: 'semantic-declaration-merge',
|
|
7
|
+
candidateAdmissionStatus: 'blocked'
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export { blockedMergeCandidate };
|
|
@@ -114,7 +114,9 @@ function proofRecord(proof, change, sourcePath, binding, hash) {
|
|
|
114
114
|
generatedClassNameMapHash: contract.generatedClassNameMapHash,
|
|
115
115
|
jsTsUseSiteGraphHash: contract.jsTsUseSiteGraphHash,
|
|
116
116
|
cssModuleCompositionGraphHash: contract.cssModuleCompositionGraphHash,
|
|
117
|
-
icssGraphHash: contract.icssGraphHash
|
|
117
|
+
icssGraphHash: contract.icssGraphHash,
|
|
118
|
+
bundlerTransformHash: proof.bundlerTransformHash,
|
|
119
|
+
sourceMapProofHash: proof.sourceMapProofHash
|
|
118
120
|
};
|
|
119
121
|
}
|
|
120
122
|
|
package/dist/semantic-merge.js
CHANGED
|
@@ -7,6 +7,7 @@ import { applyAtRuleBlockChanges, atRuleBlockEntry, atRuleBlockOverlapConflicts,
|
|
|
7
7
|
import { declarationsOverlapByCssProperty, deterministicShorthandExpansion, shorthandGroupForProperty } from './semantic-merge-shorthand.js';
|
|
8
8
|
import { mergeShorthandExpansionEvidence } from './semantic-merge-shorthand-evidence.js';
|
|
9
9
|
import { duplicateCascadeKeyConflictsForIndexes } from './semantic-merge-duplicate-cascade.js';
|
|
10
|
+
import { blockedMergeCandidate } from './semantic-merge-blocked-candidate.js';
|
|
10
11
|
|
|
11
12
|
function safeMergeCssSource(input = {}, context = {}) {
|
|
12
13
|
const parseSheet = context.parseCssSemanticSheet;
|
|
@@ -59,7 +60,7 @@ function safeMergeCssSource(input = {}, context = {}) {
|
|
|
59
60
|
const dependencyGraphAdmission = admitCssDependencyGraphProofs({ id, sourcePath, input, dependencyGraphEvidence, binding: { base, worker, head, output: mergedSourceText }, hash });
|
|
60
61
|
const cssModuleAdmission = admitCssModuleContractProofs({ id, sourcePath, input, moduleChanges, binding: { base, worker, head, output: mergedSourceText }, hash });
|
|
61
62
|
const conflicts = [...parserConflicts, ...duplicateCascadeKeyConflicts, ...proofConflicts, ...overlapConflicts, ...cssModuleAdmission.conflicts, ...cascadeRuntimeAdmission.conflicts, ...dependencyGraphAdmission.conflicts, ...selectorTargetPlan.conflicts];
|
|
62
|
-
if (conflicts.length) return blocked(id, sourcePath, 'css-semantic-merge-conflict', conflicts, { parserEvidence, shorthandExpansionEvidence, dependencyGraphEvidence, selectorTargetEvidence: selectorTargetPlan.evidence, cssModuleContractProofs: cssModuleAdmission.proofs, cascadeRuntimeProofs: cascadeRuntimeAdmission.proofs, dependencyGraphProofs: dependencyGraphAdmission.proofs });
|
|
63
|
+
if (conflicts.length) return blocked(id, sourcePath, 'css-semantic-merge-conflict', conflicts, { parserEvidence, shorthandExpansionEvidence, dependencyGraphEvidence, selectorTargetEvidence: selectorTargetPlan.evidence, cssModuleContractProofs: cssModuleAdmission.proofs, cascadeRuntimeProofs: cascadeRuntimeAdmission.proofs, dependencyGraphProofs: dependencyGraphAdmission.proofs, ...blockedMergeCandidate(input, mergedSourceText, hash) });
|
|
63
64
|
return merged(id, sourcePath, mergedSourceText, 'semantic-declaration-merge', hash, {
|
|
64
65
|
baseSheetHash: sheets.base.sheetHash,
|
|
65
66
|
workerSheetHash: sheets.worker.sheetHash,
|
package/package.json
CHANGED