Annotate return types to satisfy isolatedDeclarations (#1607)

Author: askoufis

packages/css/src/adapter.ts

@@ -22,13 +22,13 @@ const currentAdapter = () => {
 
 let hasConfiguredAdapter = false;
 
-export const setAdapterIfNotSet = (newAdapter: Adapter) => {
+export const setAdapterIfNotSet = (newAdapter: Adapter): void => {
   if (!hasConfiguredAdapter) {
     setAdapter(newAdapter);
   }
 };
 
-export const setAdapter = (newAdapter: Adapter) => {
+export const setAdapter = (newAdapter: Adapter): void => {
   if (!newAdapter) {
     throw new Error('No adapter provided when calling "setAdapter"');
   }
@@ -38,7 +38,7 @@ export const setAdapter = (newAdapter: Adapter) => {
   adapterStack.push(newAdapter);
 };
 
-export const removeAdapter = () => {
+export const removeAdapter = (): void => {
   adapterStack.pop();
 };
 

packages/css/src/conditionalRulesets.ts

@@ -12,6 +12,8 @@ type Condition = {
   children: ConditionalRuleset;
 };
 
+type RenderedConditionalRule = Record<string, Record<string, any>>;
+
 export class ConditionalRuleset {
   ruleset: Map<Query, Condition>;
 
@@ -27,7 +29,7 @@ export class ConditionalRuleset {
     this.precedenceLookup = new Map();
   }
 
-  findOrCreateCondition(conditionQuery: Query) {
+  findOrCreateCondition(conditionQuery: Query): Condition {
     let targetCondition = this.ruleset.get(conditionQuery);
 
     if (!targetCondition) {
@@ -43,7 +45,7 @@ export class ConditionalRuleset {
     return targetCondition;
   }
 
-  getConditionalRulesetByPath(conditionPath: Array<Query>) {
+  getConditionalRulesetByPath(conditionPath: Array<Query>): ConditionalRuleset {
     let currRuleset: ConditionalRuleset = this;
 
     for (const query of conditionPath) {
@@ -55,7 +57,11 @@ export class ConditionalRuleset {
     return currRuleset;
   }
 
-  addRule(rule: Rule, conditionQuery: Query, conditionPath: Array<Query>) {
+  addRule(
+    rule: Rule,
+    conditionQuery: Query,
+    conditionPath: Array<Query>,
+  ): void {
     const ruleset = this.getConditionalRulesetByPath(conditionPath);
     const targetCondition = ruleset.findOrCreateCondition(conditionQuery);
 
@@ -69,7 +75,7 @@ export class ConditionalRuleset {
   addConditionPrecedence(
     conditionPath: Array<Query>,
     conditionOrder: Array<Query>,
-  ) {
+  ): void {
     const ruleset = this.getConditionalRulesetByPath(conditionPath);
 
     for (let i = 0; i < conditionOrder.length; i++) {
@@ -86,7 +92,7 @@ export class ConditionalRuleset {
     }
   }
 
-  isCompatible(incomingRuleset: ConditionalRuleset) {
+  isCompatible(incomingRuleset: ConditionalRuleset): boolean {
     for (const [
       condition,
       orderPrecedence,
@@ -117,7 +123,7 @@ export class ConditionalRuleset {
     return true;
   }
 
-  merge(incomingRuleset: ConditionalRuleset) {
+  merge(incomingRuleset: ConditionalRuleset): void {
     // Merge rulesets into one array
     for (const { query, rules, children } of incomingRuleset.ruleset.values()) {
       const matchingCondition = this.ruleset.get(query);
@@ -150,7 +156,7 @@ export class ConditionalRuleset {
    *
    * @returns true if successful, false if the ruleset is incompatible
    */
-  mergeIfCompatible(incomingRuleset: ConditionalRuleset) {
+  mergeIfCompatible(incomingRuleset: ConditionalRuleset): boolean {
     if (!this.isCompatible(incomingRuleset)) {
       return false;
     }
@@ -160,7 +166,7 @@ export class ConditionalRuleset {
     return true;
   }
 
-  getSortedRuleset() {
+  getSortedRuleset(): Condition[] {
     const sortedRuleset: Array<Condition> = [];
 
     // Loop through all queries and add them to the sorted ruleset
@@ -189,11 +195,11 @@ export class ConditionalRuleset {
     return sortedRuleset;
   }
 
-  renderToArray() {
-    const arr: any = [];
+  renderToArray(): RenderedConditionalRule[] {
+    const arr: RenderedConditionalRule[] = [];
 
     for (const { query, rules, children } of this.getSortedRuleset()) {
-      const selectors: any = {};
+      const selectors: Record<string, any> = {};
 
       for (const rule of rules) {
         selectors[rule.selector] = {

packages/css/src/container.ts

@@ -2,5 +2,5 @@ import { generateIdentifier } from './identifier';
 
 // createContainer is used for local scoping of CSS containers
 // For now it is mostly just an alias of generateIdentifier
-export const createContainer = (debugId?: string) =>
+export const createContainer = (debugId?: string): string =>
   generateIdentifier(debugId);

packages/css/src/fileScope.ts

@@ -6,7 +6,7 @@ let refCounter = 0;
 
 const fileScopes: Array<FileScope> = [];
 
-export function setFileScope(filePath: string, packageName?: string) {
+export function setFileScope(filePath: string, packageName?: string): void {
   refCounter = 0;
   const fileScope = {
     filePath,
@@ -16,13 +16,13 @@ export function setFileScope(filePath: string, packageName?: string) {
   onBeginFileScope(fileScope);
 }
 
-export function endFileScope() {
+export function endFileScope(): void {
   onEndFileScope(getFileScope());
   refCounter = 0;
   fileScopes.splice(0, 1);
 }
 
-export function hasFileScope() {
+export function hasFileScope(): boolean {
   return fileScopes.length > 0;
 }
 
@@ -41,6 +41,6 @@ export function getFileScope(): FileScope {
   return fileScopes[0];
 }
 
-export function getAndIncrementRefCounter() {
+export function getAndIncrementRefCounter(): number {
   return refCounter++;
 }

packages/css/src/functionSerializer.ts

@@ -16,7 +16,7 @@ interface SerializerConfig {
 export function addFunctionSerializer<Target extends object>(
   target: Target,
   recipe: SerializerConfig,
-) {
+): Target {
   // TODO: Update to "__function_serializer__" in future.
   // __recipe__ is the backwards compatible name
   Object.defineProperty(target, '__recipe__', {

packages/css/src/getDebugFileName.ts

@@ -56,7 +56,7 @@ const memoizedGetDebugFileName = () => {
     max: 500,
   });
 
-  return (path: string) => {
+  return (path: string): string => {
     const cachedResult = cache.get(path);
 
     if (cachedResult) {
@@ -70,4 +70,5 @@ const memoizedGetDebugFileName = () => {
   };
 };
 
-export const getDebugFileName = memoizedGetDebugFileName();
+export const getDebugFileName: (path: string) => string =
+  memoizedGetDebugFileName();

packages/css/src/injectStyles.ts

@@ -6,7 +6,7 @@ interface InjectStylesOptions {
   fileScope: FileScope;
   css: string;
 }
-export const injectStyles = ({ fileScope, css }: InjectStylesOptions) => {
+export const injectStyles = ({ fileScope, css }: InjectStylesOptions): void => {
   const fileScopeId = fileScope.packageName
     ? [fileScope.packageName, fileScope.filePath].join('/')
     : fileScope.filePath;

packages/css/src/recipe.ts

@@ -1,6 +1,8 @@
 import { addFunctionSerializer } from './functionSerializer';
 
-/**
- * @deprecated Use 'addFunctionSerializer' from '@vanilla-extract/css/functionSerializer'
- */
-export const addRecipe = addFunctionSerializer;
+export {
+  /**
+   * @deprecated Use 'addFunctionSerializer' from '@vanilla-extract/css/functionSerializer'
+   */
+  addFunctionSerializer as addRecipe,
+};

packages/css/src/style.ts

@@ -67,7 +67,7 @@ function composedStyle(rules: Array<StyleRule | ClassNames>, debugId?: string) {
   return result;
 }
 
-export function style(rule: ComplexStyleRule, debugId?: string) {
+export function style(rule: ComplexStyleRule, debugId?: string): string {
   if (Array.isArray(rule)) {
     return composedStyle(rule, debugId);
   }
@@ -83,20 +83,20 @@ export function style(rule: ComplexStyleRule, debugId?: string) {
 /**
  * @deprecated The same functionality is now provided by the 'style' function when you pass it an array
  */
-export function composeStyles(...classNames: Array<ClassNames>) {
+export function composeStyles(...classNames: Array<ClassNames>): string {
   const compose = hasFileScope() ? composedStyle : dudupeAndJoinClassList;
 
   return compose(classNames);
 }
 
-export function globalStyle(selector: string, rule: GlobalStyleRule) {
+export function globalStyle(selector: string, rule: GlobalStyleRule): void {
   appendCss({ type: 'global', selector, rule }, getFileScope());
 }
 
 export function fontFace(
   rule: FontFaceRule | FontFaceRule[],
   debugId?: string,
-) {
+): string {
   const fontFamily = `"${cssesc(generateIdentifier(debugId), {
     quotes: 'double',
   })}"`;
@@ -124,7 +124,7 @@ export function fontFace(
 export function globalFontFace(
   fontFamily: string,
   rule: FontFaceRule | FontFaceRule[],
-) {
+): void {
   const rules = Array.isArray(rule) ? rule : [rule];
 
   for (const singleRule of rules) {
@@ -135,7 +135,7 @@ export function globalFontFace(
   }
 }
 
-export function keyframes(rule: CSSKeyframes, debugId?: string) {
+export function keyframes(rule: CSSKeyframes, debugId?: string): string {
   const name = cssesc(generateIdentifier(debugId), {
     isIdentifier: true,
   });
@@ -145,7 +145,7 @@ export function keyframes(rule: CSSKeyframes, debugId?: string) {
   return name;
 }
 
-export function globalKeyframes(name: string, rule: CSSKeyframes) {
+export function globalKeyframes(name: string, rule: CSSKeyframes): void {
   appendCss({ type: 'keyframes', name, rule }, getFileScope());
 }
 

packages/css/src/transformCss.ts

@@ -639,7 +639,7 @@ class Stylesheet {
   }
 }
 
-function renderCss(v: any, indent: string = '') {
+function renderCss(v: Record<string, any>, indent: string = '') {
   const rules: Array<string> = [];
 
   for (const key of Object.keys(v)) {
@@ -679,7 +679,7 @@ export function transformCss({
   localClassNames,
   cssObjs,
   composedClassLists,
-}: TransformCSSParams) {
+}: TransformCSSParams): string[] {
   const stylesheet = new Stylesheet(localClassNames, composedClassLists);
 
   for (const root of cssObjs) {