chore(utils): move some utils and types from babel to utils package (#…

…1294)

.changeset/honest-otters-guess.md

@@ -0,0 +1,12 @@
+---
+'@linaria/atomic': patch
+'@linaria/babel-preset': patch
+'@linaria/core': patch
+'@linaria/react': patch
+'@linaria/stylelint': patch
+'@linaria/tags': patch
+'@linaria/testkit': patch
+'@linaria/utils': patch
+---
+
+Nothing has changed. Just moved some utils and types from babel to utils package.

packages/atomic/src/processors/styled.ts

@@ -3,8 +3,8 @@ import type { SourceLocation } from '@babel/types';
 import { debug } from '@linaria/logger';
 import type { IProps } from '@linaria/react/processors/styled';
 import StyledProcessor from '@linaria/react/processors/styled';
-import { hasMeta } from '@linaria/tags';
 import type { Rules, ValueCache } from '@linaria/tags';
+import { hasMeta } from '@linaria/utils';
 
 import atomize from './helpers/atomize';
 

packages/babel/src/index.ts

@@ -1,5 +1,5 @@
 /**
- * File defines babel prest for Linaria.
+ * File defines babel preset for Linaria.
  * It uses ./extract function that is an entry point for styles extraction.
  * It also bypass babel options defined in Linaria config file with it's defaults (see ./utils/loadOptions).
  */
@@ -14,8 +14,6 @@ import loadLinariaOptions from './transform-stages/helpers/loadLinariaOptions';
 export { slugify } from '@linaria/utils';
 
 export { default as preeval } from './plugins/preeval';
-export * from './utils/collectTemplateDependencies';
-export { default as collectTemplateDependencies } from './utils/collectTemplateDependencies';
 export { default as withLinariaMetadata } from './utils/withLinariaMetadata';
 export { default as Module, DefaultModuleImplementation } from './module';
 export { default as transform } from './transform';

packages/babel/src/transform-stages/4-extract.ts

@@ -4,9 +4,11 @@ import type { Mapping } from 'source-map';
 import { SourceMapGenerator } from 'source-map';
 import stylis from 'stylis';
 
-import type { BaseProcessor, Replacements } from '@linaria/tags';
+import type { Rules } from '@linaria/tags';
+import type { Replacements } from '@linaria/utils';
+import type { Artifact } from '@linaria/utils/types/types';
 
-import type { Rules, Options, PreprocessorFn } from '../types';
+import type { Options, PreprocessorFn } from '../types';
 
 const STYLIS_DECLARATION = 1;
 const posixSep = path.posix.sep;
@@ -118,7 +120,9 @@ function extractCssFromAst(
  * Extract artifacts (e.g. CSS) from processors
  */
 export default function extractStage(
-  processors: BaseProcessor[],
+  processors: {
+    artifacts: Artifact[];
+  }[],
   originalCode: string,
   options: Options
 ) {

packages/babel/src/transform-stages/helpers/loadLinariaOptions.ts

@@ -9,7 +9,24 @@ export type PluginOptions = StrictOptions & {
   stage?: Stage;
 };
 
-const explorerSync = cosmiconfigSync('linaria');
+const searchPlaces = [
+  `.linariarc`,
+  `.linariarc.json`,
+  `.linariarc.yaml`,
+  `.linariarc.yml`,
+  `.linariarc.js`,
+  `.linariarc.cjs`,
+  `.config/linariarc`,
+  `.config/linariarc.json`,
+  `.config/linariarc.yaml`,
+  `.config/linariarc.yml`,
+  `.config/linariarc.js`,
+  `.config/linariarc.cjs`,
+  `linaria.config.js`,
+  `linaria.config.cjs`,
+];
+
+const explorerSync = cosmiconfigSync('linaria', { searchPlaces });
 
 const cache = new WeakMap<Partial<PluginOptions>, StrictOptions>();
 const defaultOverrides = {};
@@ -32,17 +49,7 @@ export default function loadLinariaOptions(
   const options = {
     displayName: false,
     evaluate: true,
-    extensions: [
-      '.cjs',
-      '.cts',
-      '.json',
-      '.js',
-      '.jsx',
-      '.mjs',
-      '.mts',
-      '.ts',
-      '.tsx',
-    ],
+    extensions: ['.cjs', '.cts', '.js', '.jsx', '.mjs', '.mts', '.ts', '.tsx'],
     rules: rules ?? [
       {
         action: require.resolve('@linaria/shaker'),

packages/babel/src/types.ts

@@ -4,9 +4,12 @@ import type { File } from '@babel/types';
 import type { RawSourceMap } from 'source-map';
 
 import type { BaseProcessor } from '@linaria/tags';
+import type { LinariaMetadata, Replacement, Rules } from '@linaria/utils';
 
 import type { PluginOptions } from './transform-stages/helpers/loadLinariaOptions';
 
+export type { Value, ValueCache } from '@linaria/tags';
+
 export type {
   ExpressionValue,
   FunctionValue,
@@ -15,32 +18,12 @@ export type {
   JSONValue,
   LazyValue,
   Serializable,
-  Value,
-  ValueCache,
-} from '@linaria/tags';
-
-export { ValueType } from '@linaria/tags';
-
-export interface ICSSRule {
-  className: string;
-  displayName: string;
-  cssText: string;
-  start: Location | null | undefined;
-  atom?: boolean;
-}
+} from '@linaria/utils';
 
-export type Rules = Record<string, ICSSRule>;
+export { ValueType } from '@linaria/utils';
 
 export type Dependencies = string[];
 
-export type LinariaMetadata = {
-  processors: BaseProcessor[];
-
-  rules: Rules;
-  replacements: Replacement[];
-  dependencies: string[];
-};
-
 export interface IPluginState extends PluginPass {
   processors: BaseProcessor[];
   dependencies: Dependencies;
@@ -58,16 +41,6 @@ export interface ITransformFileResult {
 
 export type Stage = 'preeval' | 'collect';
 
-export type Location = {
-  line: number;
-  column: number;
-};
-
-export type Replacement = {
-  original: { start: Location; end: Location };
-  length: number;
-};
-
 export type Result = {
   code: string;
   sourceMap?: RawSourceMap | null;

packages/babel/src/utils/__tests__/collectTemplateDependencies.test.ts

@@ -4,8 +4,9 @@ import generate from '@babel/generator';
 import dedent from 'dedent';
 import stripAnsi from 'strip-ansi';
 
+import { extractExpression } from '@linaria/utils';
+
 import type { MissedBabelCoreTypes } from '../../types';
-import { extractExpression } from '../collectTemplateDependencies';
 
 const { File } = babel as typeof babel & MissedBabelCoreTypes;
 

packages/babel/src/utils/getTagProcessor.ts

@@ -9,30 +9,23 @@ import type {
   SourceLocation,
   Identifier,
   MemberExpression,
+  Program,
 } from '@babel/types';
 
 import { BaseProcessor } from '@linaria/tags';
-import type {
-  Param,
-  Params,
-  IFileContext,
-  ExpressionValue,
-  TagSource,
-} from '@linaria/tags';
-import type { IImport, StrictOptions } from '@linaria/utils';
+import type { Param, Params, IFileContext, TagSource } from '@linaria/tags';
+import type { ExpressionValue, IImport, StrictOptions } from '@linaria/utils';
 import {
   collectExportsAndImports,
+  collectTemplateDependencies,
   explicitImport,
+  extractExpression,
   findPackageJSON,
+  getSource,
   isNotNull,
   mutate,
 } from '@linaria/utils';
 
-import collectTemplateDependencies, {
-  extractExpression,
-} from './collectTemplateDependencies';
-import getSource from './getSource';
-
 type BuilderArgs = ConstructorParameters<typeof BaseProcessor> extends [
   Params,
   TagSource,
@@ -337,7 +330,7 @@ function getBuilderForIdentifier(
 function getDisplayName(
   path: NodePath<Identifier>,
   idx: number,
-  fileContext: IFileContext
+  filename?: string | null
 ): string {
   let displayName: string | undefined;
 
@@ -372,11 +365,10 @@ function getDisplayName(
   }
 
   if (!displayName) {
-    const filename = fileContext.filename ?? 'unknown';
     // Try to derive the path from the filename
-    displayName = basename(filename);
+    displayName = basename(filename ?? 'unknown');
 
-    if (/^index\.[a-z\d]+$/.test(displayName)) {
+    if (filename && /^index\.[a-z\d]+$/.test(displayName)) {
       // If the file name is 'index', better to get name from parent folder
       displayName = basename(dirname(filename));
     }
@@ -446,7 +438,7 @@ export default function getTagProcessor(
   >
 ): BaseProcessor | null {
   if (!cache.has(path.node)) {
-    const root = path.scope.getProgramParent().path;
+    const root = path.scope.getProgramParent().path as NodePath<Program>;
     const { imports } = collectExportsAndImports(root);
     try {
       const builder = getBuilderForIdentifier(
@@ -461,7 +453,7 @@ export default function getTagProcessor(
         // Also used for display name if it couldn't be determined
         const idx = getNextIndex(fileContext);
 
-        const displayName = getDisplayName(path, idx, fileContext);
+        const displayName = getDisplayName(path, idx, fileContext.filename);
 
         const processor = builder(
           displayName,

packages/babel/src/utils/withLinariaMetadata.ts

@@ -1,4 +1,4 @@
-import type { LinariaMetadata } from '../types';
+import type { LinariaMetadata } from '@linaria/utils';
 
 const withLinariaMetadata = (
   value: unknown

packages/core/src/css.ts

@@ -1,4 +1,4 @@
-import type { StyledMeta } from '@linaria/tags';
+import type { StyledMeta } from '@linaria/utils';
 
 import type { CSSProperties } from './CSSProperties';
 import type { LinariaClassName } from './cx';

packages/react/src/index.ts

@@ -6,4 +6,4 @@ export type {
   Styled,
 } from './styled';
 export type { CSSProperties } from '@linaria/core';
-export type { StyledMeta } from '@linaria/tags';
+export type { StyledMeta } from '@linaria/utils';

packages/react/src/processors/styled.ts

@@ -20,14 +20,12 @@ import type {
 } from '@linaria/tags';
 import {
   buildSlug,
-  hasMeta,
   TaggedTemplateProcessor,
   validateParams,
-  ValueType,
   toValidCSSIdentifier,
 } from '@linaria/tags';
 import type { IVariableContext } from '@linaria/utils';
-import { findPackageJSON, slugify } from '@linaria/utils';
+import { findPackageJSON, hasMeta, slugify, ValueType } from '@linaria/utils';
 
 const isNotNull = <T>(x: T | null): x is T => x !== null;
 

packages/react/src/styled.ts

@@ -10,7 +10,7 @@ import React from 'react';
 
 import { cx } from '@linaria/core';
 import type { CSSProperties } from '@linaria/core';
-import type { StyledMeta } from '@linaria/tags';
+import type { StyledMeta } from '@linaria/utils';
 
 export type NoInfer<A> = [A][A extends any ? 0 : never];
 

packages/stylelint/src/preprocessor.ts

@@ -1,7 +1,7 @@
 import stripAnsi from 'strip-ansi';
 
 import { transform } from '@linaria/babel-preset';
-import type { Replacement } from '@linaria/babel-preset';
+import type { Replacements } from '@linaria/utils';
 import { asyncResolveFallback } from '@linaria/utils';
 
 type Errors = {
@@ -21,7 +21,7 @@ type Errors = {
 };
 
 type Cache = {
-  [key: string]: Replacement[] | null | undefined;
+  [key: string]: Replacements | null | undefined;
 };
 
 type Warning = {

packages/tags/src/BaseProcessor.ts

@@ -8,16 +8,11 @@ import type {
   MemberExpression,
 } from '@babel/types';
 
-import type {
-  ExpressionValue,
-  IInterpolation,
-  Params,
-  Value,
-  ValueCache,
-  Artifact,
-} from './types';
+import type { Artifact, ExpressionValue } from '@linaria/utils';
+import { hasMeta } from '@linaria/utils';
+
+import type { IInterpolation, Params, Value, ValueCache } from './types';
 import getClassNameAndSlug from './utils/getClassNameAndSlug';
-import hasMeta from './utils/hasMeta';
 import { isCSSable } from './utils/toCSS';
 import type { IFileContext, IOptions } from './utils/types';
 import { validateParams } from './utils/validateParams';
@@ -34,7 +29,7 @@ export type TagSource = {
   source: string;
 };
 
-export default abstract class BaseProcessor {
+export abstract class BaseProcessor {
   public static SKIP = Symbol('skip');
 
   public readonly artifacts: Artifact[] = [];

packages/tags/src/TaggedTemplateProcessor.ts

@@ -1,9 +1,11 @@
 import type { TemplateElement, Expression, SourceLocation } from '@babel/types';
 
+import type { ExpressionValue } from '@linaria/utils';
+import { ValueType } from '@linaria/utils';
+
 import type { TailProcessorParams } from './BaseProcessor';
-import BaseProcessor from './BaseProcessor';
-import type { ExpressionValue, ValueCache, Rules, Params } from './types';
-import { ValueType } from './types';
+import { BaseProcessor } from './BaseProcessor';
+import type { ValueCache, Rules, Params } from './types';
 import templateProcessor from './utils/templateProcessor';
 import { validateParams } from './utils/validateParams';
 

packages/tags/src/index.ts

@@ -1,10 +1,14 @@
-export * from './BaseProcessor';
+export { BaseProcessor } from './BaseProcessor';
+export type {
+  Expression,
+  TagSource,
+  ProcessorParams,
+  TailProcessorParams,
+} from './BaseProcessor';
 export * from './types';
 export { buildSlug } from './utils/buildSlug';
-export { default as isSerializable } from './utils/isSerializable';
-export * from './utils/types';
-export * from './utils/validateParams';
-export { default as BaseProcessor } from './BaseProcessor';
+export type { IOptions, IFileContext } from './utils/types';
+export { isValidParams, validateParams } from './utils/validateParams';
+export type { MapParams, ParamConstraints } from './utils/validateParams';
 export { default as TaggedTemplateProcessor } from './TaggedTemplateProcessor';
-export { default as hasMeta } from './utils/hasMeta';
 export { default as toValidCSSIdentifier } from './utils/toValidCSSIdentifier';