refactor: use flags from meta

- instead of piping them everywhere
wix · Dec 3, 2023 · 00b5f04 · 00b5f04
1 parent 00b0e12
commit 00b5f04
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 74 deletions.
diff --git a/packages/core-test-kit/src/generate-test-util.ts b/packages/core-test-kit/src/generate-test-util.ts
@@ -101,7 +101,6 @@ export function createTransformer(
         replaceValueHook,
         postProcessor,
         mode: config.mode,
-        flags: { ...defaultFeatureFlags },
     });
 }
 

diff --git a/packages/core/src/features/css-class.ts b/packages/core/src/features/css-class.ts
@@ -239,7 +239,6 @@ export const hooks = createFeature<{
         if (selectorContext.originMeta === meta && symbol[`-st-states`]) {
             // ToDo: refactor out to transformer validation phase
             validateRuleStateDefinition(
-                context.flags,
                 selectorContext.selectorStr,
                 selectorContext.ruleOrAtRule,
                 context.meta,

diff --git a/packages/core/src/features/css-custom-property.ts b/packages/core/src/features/css-custom-property.ts
@@ -285,7 +285,7 @@ function addCSSProperty({
             // already defined
             return;
             // eslint-disable-next-line no-constant-condition
-        } else if (context.meta.type === 'stylable' && context.flags.strictCustomProperty) {
+        } else if (context.meta.type === 'stylable' && context.meta.flags.strictCustomProperty) {
             // strict mode
             context.diagnostics.report(diagnostics.UNDEFINED_CSS_CUSTOM_PROP(name), {
                 node,

diff --git a/packages/core/src/features/css-pseudo-class.ts b/packages/core/src/features/css-pseudo-class.ts
@@ -29,7 +29,6 @@ export const hooks = createFeature({
         if (inferredState) {
             if (selectorContext.transform) {
                 STCustomState.transformPseudoClassToCustomState(
-                    context.flags,
                     inferredState.state,
                     inferredState.meta,
                     node.value,

diff --git a/packages/core/src/features/feature.ts b/packages/core/src/features/feature.ts
@@ -28,7 +28,6 @@ export type SelectorNodeContext = [
 export interface FeatureContext {
     meta: StylableMeta;
     diagnostics: Diagnostics;
-    flags: FeatureFlags;
 }
 export interface FeatureTransformContext extends FeatureContext {
     resolver: StylableResolver;

diff --git a/packages/core/src/features/st-symbol.ts b/packages/core/src/features/st-symbol.ts
@@ -167,7 +167,7 @@ export function addSymbol({
     safeRedeclare = false,
     localName,
 }: {
-    context: Omit<FeatureContext, 'flags'>;
+    context: FeatureContext;
     symbol: StylableSymbol;
     node?: postcss.Node;
     safeRedeclare?: boolean;
@@ -190,7 +190,7 @@ export function addSymbol({
     return symbol;
 }
 
-export function reportRedeclare(context: Omit<FeatureContext, 'flags'>) {
+export function reportRedeclare(context: FeatureContext) {
     const { byNS } = plugableRecord.getUnsafe(context.meta.data, dataKey);
     for (const symbols of Object.values(byNS)) {
         const flat: Record<string, SymbolDeclaration[]> = {};

diff --git a/packages/core/src/features/st-var.ts b/packages/core/src/features/st-var.ts
@@ -188,7 +188,6 @@ export class StylablePublicApi {
             const diagnostics = new Diagnostics();
             const { outputValue, topLevelType, runtimeValue } = evaluator.evaluateValue(
                 {
-                    flags: this.stylable.flags,
                     resolver: this.stylable.resolver,
                     evaluator,
                     meta,

diff --git a/packages/core/src/functions.ts b/packages/core/src/functions.ts
@@ -14,7 +14,7 @@ import type { replaceValueHook, RuntimeStVar, StylableTransformer } from './styl
 import { getFormatterArgs, getStringValue, stringifyFunction } from './helpers/value';
 import { unescapeCSS } from './helpers/escape';
 import type { ParsedValue } from './types';
-import type { FeatureFlags, FeatureTransformContext } from './features/feature';
+import type { FeatureTransformContext } from './features/feature';
 import { CSSCustomProperty, STVar } from './features';
 import { unbox, CustomValueError } from './custom-values';
 
@@ -54,7 +54,6 @@ export class StylableEvaluator {
     ) {
         return processDeclarationValue(
             context.resolver,
-            context.flags,
             this.getResolvedSymbols,
             data.value,
             data.meta,
@@ -99,7 +98,6 @@ export function resolveArgumentsValue(
     for (const k in options) {
         resolvedArgs[k] = evalDeclarationValue(
             transformer.resolver,
-            transformer.flags,
             unescapeCSS(options[k]),
             meta,
             node,
@@ -115,7 +113,6 @@ export function resolveArgumentsValue(
 
 export function processDeclarationValue(
     resolver: StylableResolver,
-    flags: FeatureFlags,
     getResolvedSymbols: (meta: StylableMeta) => MetaResolvedSymbols,
     value: string,
     meta: StylableMeta,
@@ -147,7 +144,6 @@ export function processDeclarationValue(
                         evaluator,
                         getResolvedSymbols,
                         passedThrough,
-                        flags,
                     },
                     data: {
                         value,
@@ -220,7 +216,6 @@ export function processDeclarationValue(
                         evaluator,
                         getResolvedSymbols,
                         passedThrough,
-                        flags,
                     },
                     data: {
                         value,
@@ -303,7 +298,6 @@ export function processDeclarationValue(
 
 export function evalDeclarationValue(
     resolver: StylableResolver,
-    flags: FeatureFlags,
     value: string,
     meta: StylableMeta,
     node?: postcss.Node,
@@ -319,7 +313,6 @@ export function evalDeclarationValue(
 ): string {
     return processDeclarationValue(
         resolver,
-        flags,
         getResolvedSymbols,
         value,
         meta,

diff --git a/packages/core/src/helpers/custom-state.ts b/packages/core/src/helpers/custom-state.ts
@@ -23,7 +23,6 @@ import { CSSClass } from '../features';
 import { reservedFunctionalPseudoClasses } from '../native-reserved-lists';
 import { BaseAstNode, stringifyCSSValue } from '@tokey/css-value-parser';
 import { findCustomIdent, findNextCallNode } from './css-value-seeker';
-import type { FeatureFlags } from '../features/feature';
 
 export interface MappedStates {
     [s: string]: StateParsedValue | string | TemplateStateParsedValue | null;
@@ -764,7 +763,6 @@ export const systemValidators: Record<string, StateParamType> = {
 };
 
 export function validateRuleStateDefinition(
-    flags: FeatureFlags,
     selector: string,
     selectorNode: postcss.Rule | postcss.AtRule,
     meta: StylableMeta,
@@ -787,7 +785,6 @@ export function validateRuleStateDefinition(
                     if (state && typeof state === 'object') {
                         const stateParam = isTemplateState(state) ? state.params[0] : state;
                         const { errors } = validateStateArgument(
-                            flags,
                             stateParam,
                             meta,
                             stateParam.defaultValue || '',
@@ -825,7 +822,6 @@ export function validateRuleStateDefinition(
 }
 
 export function validateStateArgument(
-    flags: FeatureFlags,
     stateAst: StateParsedValue,
     meta: StylableMeta,
     value: string,
@@ -837,7 +833,6 @@ export function validateStateArgument(
 ) {
     const resolvedValidations: StateResult = {
         res: resolveParam(
-            flags,
             meta,
             resolver,
             diagnostics,
@@ -855,7 +850,7 @@ export function validateStateArgument(
             const { errors } = validator.validate(
                 resolvedValidations.res,
                 stateAst.arguments,
-                resolveParam.bind(null, flags, meta, resolver, diagnostics, selectorNode),
+                resolveParam.bind(null, meta, resolver, diagnostics, selectorNode),
                 !!validateDefinition,
                 validateValue
             );
@@ -871,7 +866,6 @@ export function validateStateArgument(
 // transform
 
 export function transformPseudoClassToCustomState(
-    flags: FeatureFlags,
     stateDef: MappedStates[string],
     meta: StylableMeta,
     name: string,
@@ -903,7 +897,6 @@ export function transformPseudoClassToCustomState(
     } else if (typeof stateDef === 'object') {
         if (isTemplateState(stateDef)) {
             convertTemplateState(
-                flags,
                 meta,
                 resolver,
                 diagnostics,
@@ -914,7 +907,6 @@ export function transformPseudoClassToCustomState(
             );
         } else {
             resolveStateValue(
-                flags,
                 meta,
                 resolver,
                 diagnostics,
@@ -953,7 +945,6 @@ export function resolveStateParam(param: string, escape = false) {
     return escape ? cssesc(`s` + result, { isIdentifier: true }).slice(1) : result;
 }
 function convertTemplateState(
-    flags: FeatureFlags,
     meta: StylableMeta,
     resolver: StylableResolver,
     diagnostics: Diagnostics,
@@ -964,7 +955,6 @@ function convertTemplateState(
 ) {
     const paramStateDef = stateParamDef.params[0];
     const resolvedParam = getParamInput(
-        flags,
         meta,
         resolver,
         diagnostics,
@@ -974,16 +964,7 @@ function convertTemplateState(
         name
     );
 
-    validateParam(
-        flags,
-        meta,
-        resolver,
-        diagnostics,
-        selectorNode,
-        paramStateDef,
-        resolvedParam,
-        name
-    );
+    validateParam(meta, resolver, diagnostics, selectorNode, paramStateDef, resolvedParam, name);
 
     const strippedParam = stripQuotation(resolvedParam);
     transformMappedStateWithParam({
@@ -996,7 +977,6 @@ function convertTemplateState(
     });
 }
 function getParamInput(
-    flags: FeatureFlags,
     meta: StylableMeta,
     resolver: StylableResolver,
     diagnostics: Diagnostics,
@@ -1008,7 +988,6 @@ function getParamInput(
     const inputValue =
         stateNode.nodes && stateNode.nodes.length ? stringifySelector(stateNode.nodes) : ``;
     const resolvedParam = resolveParam(
-        flags,
         meta,
         resolver,
         diagnostics,
@@ -1025,7 +1004,6 @@ function getParamInput(
     return resolvedParam;
 }
 function validateParam(
-    flags: FeatureFlags,
     meta: StylableMeta,
     resolver: StylableResolver,
     diagnostics: Diagnostics,
@@ -1041,7 +1019,7 @@ function validateParam(
         stateParamOutput = validator.validate(
             resolvedParam,
             stateParamDef.arguments,
-            resolveParam.bind(null, flags, meta, resolver, diagnostics, selectorNode),
+            resolveParam.bind(null, meta, resolver, diagnostics, selectorNode),
             false,
             true
         );
@@ -1070,7 +1048,6 @@ function validateParam(
     }
 }
 function resolveStateValue(
-    flags: FeatureFlags,
     meta: StylableMeta,
     resolver: StylableResolver,
     diagnostics: Diagnostics,
@@ -1081,7 +1058,6 @@ function resolveStateValue(
     namespace: string
 ) {
     const resolvedParam = getParamInput(
-        flags,
         meta,
         resolver,
         diagnostics,
@@ -1091,16 +1067,7 @@ function resolveStateValue(
         name
     );
 
-    validateParam(
-        flags,
-        meta,
-        resolver,
-        diagnostics,
-        selectorNode,
-        stateParamDef,
-        resolvedParam,
-        name
-    );
+    validateParam(meta, resolver, diagnostics, selectorNode, stateParamDef, resolvedParam, name);
 
     const strippedParam = stripQuotation(resolvedParam);
     convertToClass(stateNode).value = createStateWithParamClassName(name, namespace, strippedParam);
@@ -1209,7 +1176,6 @@ function validateTemplateSelector({
 }
 
 function resolveParam(
-    flags: FeatureFlags,
     meta: StylableMeta,
     resolver: StylableResolver,
     diagnostics: Diagnostics,
@@ -1218,14 +1184,5 @@ function resolveParam(
 ) {
     const defaultStringValue = '';
     const param = nodeContent || defaultStringValue;
-    return evalDeclarationValue(
-        resolver,
-        flags,
-        param,
-        meta,
-        node,
-        undefined,
-        undefined,
-        diagnostics
-    );
+    return evalDeclarationValue(resolver, param, meta, node, undefined, undefined, diagnostics);
 }
diff --git a/packages/core/src/stylable-meta.ts b/packages/core/src/stylable-meta.ts
@@ -65,10 +65,10 @@ export class StylableMeta {
     constructor(
         public sourceAst: postcss.Root,
         public diagnostics: Diagnostics,
-        flags: FeatureFlags
+        public flags: FeatureFlags
     ) {
         // initiate features
-        const context: FeatureContext = { meta: this, diagnostics, flags };
+        const context: FeatureContext = { meta: this, diagnostics };
         for (const { hooks } of features) {
             hooks.metaInit(context);
         }

diff --git a/packages/core/src/stylable-transformer.ts b/packages/core/src/stylable-transformer.ts
@@ -54,7 +54,6 @@ import { validateCustomPropertyName } from './helpers/css-custom-property';
 import type { ModuleResolver } from './types';
 import { getRuleScopeSelector } from './deprecated/postcss-ast-extension';
 import type { MappedStates } from './helpers/custom-state';
-import type { FeatureFlags } from './features/feature';
 
 export interface ResolvedElement {
     name: string;
@@ -109,7 +108,6 @@ export interface TransformerOptions {
     resolverCache?: StylableResolverCache;
     stVarOverride?: Record<string, string>;
     experimentalSelectorInference?: boolean;
-    flags: FeatureFlags;
 }
 
 export const transformerDiagnostics = {
@@ -136,7 +134,6 @@ export class StylableTransformer {
     private directiveNodes: postcss.Declaration[] = [];
     public experimentalSelectorInference: boolean;
     public containerInferredSelectorMap = new Map<PostcssContainer, InferredSelector>();
-    public flags: FeatureFlags;
     constructor(options: TransformerOptions) {
         this.diagnostics = options.diagnostics;
         this.keepValues = options.keepValues || false;
@@ -152,7 +149,6 @@ export class StylableTransformer {
         );
         this.mode = options.mode || 'production';
         this.defaultStVarOverride = options.stVarOverride || {};
-        this.flags = options.flags;
         this.getResolvedSymbols = createSymbolResolverWithCache(this.resolver, this.diagnostics);
         this.evaluator = new StylableEvaluator({
             valueHook: this.replaceValueHook,
@@ -176,7 +172,6 @@ export class StylableTransformer {
             resolver: this.resolver,
             evaluator: this.evaluator,
             getResolvedSymbols: this.getResolvedSymbols,
-            flags: this.flags,
         };
         STImport.hooks.transformInit({ context });
         STGlobal.hooks.transformInit({ context });
@@ -214,7 +209,6 @@ export class StylableTransformer {
             getResolvedSymbols: this.getResolvedSymbols,
             passedThrough: path.slice(),
             inferredSelectorMixin,
-            flags: this.flags,
         };
         const transformResolveOptions = {
             context: transformContext,
@@ -533,7 +527,6 @@ export class StylableTransformer {
             resolver: this.resolver,
             evaluator: this.evaluator,
             getResolvedSymbols: this.getResolvedSymbols,
-            flags: this.flags,
         };
         if (node.type === 'class') {
             CSSClass.hooks.transformSelectorNode({