@pandacss/generator 0.12.2 → 0.13.1

package/dist/index.js

@@ -555,7 +555,7 @@ function generateConditions(ctx) {
       }
       `,
     dts: import_outdent2.default`
-    import type { AnySelector, Selectors } from './selectors'
+    ${ctx.file.importType("AnySelector, Selectors", "./selectors")}
 
     export type Conditions = {
     ${keys.map((key) => `	${JSON.stringify(key)}: string`).join("\n")}
@@ -626,7 +626,7 @@ function generateCssFn(ctx) {
   const { separator, getPropShorthands } = utility;
   return {
     dts: import_outdent4.outdent`
-    import type { SystemStyleObject } from '../types'
+    ${ctx.file.importType("SystemStyleObject", "../types/index")}
 
     interface CssFunction {
       (...styles: SystemStyleObject[]): string
@@ -822,12 +822,11 @@ function generateCvaFn(ctx) {
 
     `,
     dts: import_outdent6.outdent`
-    import type { RecipeCreatorFn } from '../types/recipe'
+    ${ctx.file.importType("RecipeCreatorFn", "../types/recipe")}
 
     export declare const cva: RecipeCreatorFn
 
-    export type { RecipeVariantProps } from '../types/recipe'
-
+    ${ctx.file.exportType("RecipeVariantProps", "../types/recipe")}
     `
   };
 }
@@ -957,11 +956,11 @@ function generatePattern(ctx) {
     return {
       name: dashName,
       dts: import_outdent10.outdent`
-      import type { SystemStyleObject, ConditionalValue } from '../types'
-      import type { Properties } from '../types/csstype'
-      import type { PropertyValue } from '../types/prop-type'
-      import type { DistributiveOmit } from '../types/system-types'
-      import type { Tokens } from '../tokens'
+      ${ctx.file.importType("SystemStyleObject, ConditionalValue", "../types/index")}
+      ${ctx.file.importType("Properties", "../types/csstype")}
+      ${ctx.file.importType("PropertyValue", "../types/prop-type")}
+      ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
+      ${ctx.file.importType("Tokens", "../tokens/index")}
 
       export type ${upperName}Properties = {
          ${Object.keys(properties ?? {}).map((key) => {
@@ -1128,9 +1127,9 @@ function generateRecipes(ctx) {
         name: dashName,
         js: jsCode,
         dts: import_outdent11.outdent`
-        import type { ConditionalValue } from '../types'
-        import type { Pretty } from '../types/helpers'
-        import type { DistributiveOmit } from '../types/system-types'
+        ${ctx.file.importType("ConditionalValue", "../types/index")}
+        ${ctx.file.importType("Pretty", "../types/helpers")}
+        ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
 
         type ${upperName}Variant = {
           ${Object.keys(variantKeyMap).map((key) => {
@@ -1202,7 +1201,7 @@ function generateSvaFn(ctx) {
     }
     `,
     dts: import_outdent12.outdent`
-    import type { SlotRecipeCreatorFn } from '../types/recipe'
+    ${ctx.file.importType("SlotRecipeCreatorFn", "../types/recipe")}
 
     export declare const sva: SlotRecipeCreatorFn
     `
@@ -1235,14 +1234,14 @@ function generateTokenJs(ctx) {
   token.var = tokenVar
   `,
     dts: import_outdent13.default`
-  import type { Token } from './tokens'
+  ${ctx.file.importType("Token", "./tokens")}
 
   export declare const token: {
     (path: Token, fallback?: string): string
     var: (path: Token, fallback?: string) => string
   }
 
-  export * from './tokens'
+  ${ctx.file.exportTypeStar("./tokens")}
   `
   };
 }
@@ -1256,7 +1255,7 @@ function generatePreactJsxFactory(ctx) {
     import { h } from 'preact'
     import { forwardRef } from 'preact/compat'
     import { useMemo } from 'preact/hooks'
-    ${ctx.file.import("css, cx, assignCss", "../css/index")}
+    ${ctx.file.import("css, cx, cva, assignCss", "../css/index")}
     ${ctx.file.import("splitProps, normalizeHTMLProps", "../helpers")}
     ${ctx.file.import("isCssProperty", "./is-valid-prop")}
 
@@ -1352,9 +1351,9 @@ function generatePreactJsxPattern(ctx) {
       `,
       dts: import_outdent15.outdent`
       import type { FunctionComponent } from 'preact'
-      import type { ${upperName}Properties } from '../patterns/${dashName}'
-      import type { ${typeName} } from '../types/jsx'
-      import type { DistributiveOmit } from '../types/system-types'
+      ${ctx.file.importType(`${upperName}Properties`, `../patterns/${dashName}`)}
+      ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
+      ${ctx.file.importType(typeName, "../types/jsx")}
 
       export type ${upperName}Props = ${upperName}Properties & DistributiveOmit<${typeName}<'${jsxElement}'>, keyof ${upperName}Properties ${blocklistType}>
 
@@ -1376,8 +1375,8 @@ export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent16.outdent`
 import type { ComponentProps, JSX } from 'preact'
-import type { Assign, JsxStyleProps, JsxHTMLProps } from './system-types'
-import type { RecipeDefinition, RecipeSelection, RecipeVariantRecord } from './recipe'
+${ctx.file.importType("Assign, JsxStyleProps, JsxHTMLProps", "./system-types")}
+${ctx.file.importType("RecipeDefinition, RecipeSelection, RecipeVariantRecord", "./recipe")}
 
 type ElementType = keyof JSX.IntrinsicElements
 
@@ -1464,7 +1463,7 @@ function generatePreactJsxStringLiteralTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent18.outdent`
-import type { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent18.outdent`
@@ -1593,9 +1592,9 @@ function generateQwikJsxPattern(ctx) {
       `,
       dts: import_outdent20.outdent`
       import type { Component } from '@builder.io/qwik'
-      import type { ${upperName}Properties } from '../patterns/${dashName}'
-      import type { ${typeName} } from '../types/jsx'
-      import type { Assign, DistributiveOmit } from '../types/system-types'
+      ${ctx.file.importType(`${upperName}Properties`, `../patterns/${dashName}`)}
+      ${ctx.file.importType(typeName, "../types/jsx")}
+      ${ctx.file.importType("Assign, DistributiveOmit", "../types/system-types")}
 
       export type ${upperName}Props = Assign<${typeName}<'${jsxElement}'>, DistributiveOmit<${upperName}Properties, ${blocklistType || '""'}>>
   
@@ -1612,7 +1611,7 @@ function generateQwikJsxTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent21.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent21.outdent`
@@ -1707,7 +1706,7 @@ function generateQwikJsxStringLiteralTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent23.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent23.outdent`
@@ -1878,9 +1877,9 @@ function generateReactJsxPattern(ctx) {
       `,
       dts: import_outdent25.outdent`
       import type { FunctionComponent } from 'react'
-      import type { ${upperName}Properties } from '../patterns/${dashName}'
-      import type { ${typeName} } from '../types/jsx'
-      import type { DistributiveOmit } from '../types/system-types'
+      ${ctx.file.importType(`${upperName}Properties`, `../patterns/${dashName}`)}
+      ${ctx.file.importType(typeName, "../types/jsx")}
+      ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
 
       export type ${upperName}Props = ${upperName}Properties & DistributiveOmit<${typeName}<'${jsxElement}'>, keyof ${upperName}Properties ${blocklistType}>
 
@@ -1897,13 +1896,13 @@ function generateReactJsxTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent26.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent26.outdent`
 import type { ComponentPropsWithoutRef, ElementType, ElementRef, Ref } from 'react'
-import type { Assign, DistributiveOmit, JsxStyleProps, JsxHTMLProps } from './system-types'
-import type { RecipeDefinition, RecipeSelection, RecipeVariantRecord } from './recipe'
+${ctx.file.importType("Assign, DistributiveOmit, JsxHTMLProps, JsxStyleProps", "./system-types")}
+${ctx.file.importType("RecipeDefinition, RecipeSelection, RecipeVariantRecord", "./recipe")}
 
 type Dict = Record<string, unknown>
 
@@ -1992,12 +1991,12 @@ function generateReactJsxStringLiteralTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent28.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent28.outdent`
 import type { ComponentPropsWithoutRef, ElementType, ElementRef, Ref } from 'react'
-import type { DistributiveOmit } from '../types/system-types'
+${ctx.file.importType("DistributiveOmit", "../types/system-types")}
 
 type Dict = Record<string, unknown>
 
@@ -2137,10 +2136,10 @@ function generateSolidJsxPattern(ctx) {
     }
     `,
       dts: import_outdent30.outdent`
-    import { Component } from 'solid-js'
-    import { ${upperName}Properties } from '../patterns/${dashName}'
-    import { ${typeName} } from '../types/jsx'
-    import { DistributiveOmit } from '../types/system-types'
+    import type { Component } from 'solid-js'
+    ${ctx.file.importType(`${upperName}Properties`, `../patterns/${dashName}`)}
+    ${ctx.file.importType(typeName, "../types/jsx")}
+    ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
 
     export type ${upperName}Props = ${upperName}Properties & DistributiveOmit<${typeName}<'${jsxElement}'>, keyof ${upperName}Properties ${blocklistType}>
 
@@ -2157,13 +2156,13 @@ function generateSolidJsxTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent31.outdent`
-import type { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent31.outdent`
 import type { ComponentProps, Component, JSX } from 'solid-js'
-import type { Assign, JsxStyleProps, JsxHTMLProps } from './system-types'
-import type { RecipeDefinition, RecipeSelection, RecipeVariantRecord } from './recipe'
+${ctx.file.importType("Assign, JsxStyleProps, JsxHTMLProps", "./system-types")}
+${ctx.file.importType("RecipeDefinition, RecipeSelection, RecipeVariantRecord", "./recipe")}
 
 type Dict = Record<string, unknown>
 
@@ -2256,7 +2255,7 @@ function generateSolidJsxStringLiteralTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent33.outdent`
-import type { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent33.outdent`
@@ -2445,10 +2444,10 @@ function generateVueJsxPattern(ctx) {
     })
     `,
       dts: import_outdent36.outdent`
-    import { FunctionalComponent } from 'vue'
-    import { ${upperName}Properties } from '../patterns/${dashName}'
-    import { ${typeName} } from '../types/jsx'
-    import { DistributiveOmit } from '../types/system-types'
+    import type { FunctionalComponent } from 'vue'
+    ${ctx.file.importType(`${upperName}Properties`, `../patterns/${dashName}`)}
+    ${ctx.file.importType(typeName, "../types/jsx")}
+    ${ctx.file.importType("DistributiveOmit", "../types/system-types")}
 
     export type ${upperName}Props = ${upperName}Properties & DistributiveOmit<${typeName}<'${jsxElement}'>, keyof ${upperName}Properties ${blocklistType}>
 
@@ -2465,13 +2464,15 @@ function generateVueJsxTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent37.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
+
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent37.outdent`
 import type { Component, FunctionalComponent } from 'vue'
-import type { Assign, JsxStyleProps, JsxHTMLProps } from './system-types'
-import type { RecipeDefinition, RecipeSelection, RecipeVariantRecord } from './recipe'
+
+${ctx.file.importType("RecipeDefinition, RecipeSelection, RecipeVariantRecord", "./recipe")}
+${ctx.file.importType("Assign, JsxStyleProps, JsxHTMLProps", "./system-types")}
 
 type IntrinsicElement =
   | 'a'
@@ -2630,7 +2631,8 @@ function generateVueJsxStringLiteralTypes(ctx) {
   const { factoryName, styleProps, componentName, upperName, typeName } = ctx.jsx;
   return {
     jsxFactory: import_outdent38.outdent`
-import { ${upperName} } from '../types/jsx'
+${ctx.file.importType(upperName, "../types/jsx")}
+
 export declare const ${factoryName}: ${upperName}
     `,
     jsxType: import_outdent38.outdent`
@@ -2838,7 +2840,7 @@ function generateJsxPatterns(ctx) {
 // src/artifacts/pkg-json.ts
 function generatePackageJson(ctx) {
   const {
-    config: { outdir, outExtension: ext = "mjs" }
+    config: { outdir }
   } = ctx;
   const pkg = {
     name: outdir,
@@ -2847,32 +2849,32 @@ function generatePackageJson(ctx) {
     type: "module",
     exports: {
       "./css": {
-        types: "./css/index.d.ts",
-        require: `./css/index.${ext}`,
-        import: `./css/index.${ext}`
+        types: ctx.file.extDts("./css/index"),
+        require: ctx.file.ext(`./css/index`),
+        import: ctx.file.ext(`./css/index`)
       },
       "./jsx": {
-        types: "./jsx/index.d.ts",
-        require: `./jsx/index.${ext}`,
-        import: `./jsx/index.${ext}`
+        types: ctx.file.extDts("./jsx/index"),
+        require: ctx.file.ext(`./jsx/index`),
+        import: ctx.file.ext(`./jsx/index`)
       },
       "./patterns": {
-        types: "./patterns/index.d.ts",
-        require: `./patterns/index.${ext}`,
-        import: `./patterns/index.${ext}`
+        types: ctx.file.extDts("./patterns/index"),
+        require: ctx.file.ext(`./patterns/index`),
+        import: ctx.file.ext(`./patterns/index`)
       },
       "./recipes": {
-        types: "./recipes/index.d.ts",
-        require: `./recipes/index.${ext}`,
-        import: `./recipes/index.${ext}`
+        types: ctx.file.extDts("./recipes/index"),
+        require: ctx.file.ext(`./recipes/index`),
+        import: ctx.file.ext(`./recipes/index`)
       },
       "./tokens": {
-        types: "./tokens/index.d.ts",
-        require: `./tokens/index.${ext}`,
-        import: `./tokens/index.${ext}`
+        types: ctx.file.extDts("./tokens/index"),
+        require: ctx.file.ext(`./tokens/index`),
+        import: ctx.file.ext(`./tokens/index`)
       },
       "./types": {
-        types: "./types/index.d.ts"
+        types: ctx.file.extDts("./types/index")
       },
       "./styles.css": "./styles.css"
     }
@@ -2919,42 +2921,47 @@ var selectors_d_ts_default = {
 var import_ts_pattern9 = require("ts-pattern");
 var jsxStyleProps = "export type JsxStyleProps = StyleProps & WithCss";
 function getGeneratedTypes(ctx) {
+  const rewriteImports = (code) => code.replace(/import\s+type\s+\{([^}]+)\}\s+from\s+['"]([^'"]+)['"]/g, ctx.file.importType("$1", "$2"));
   return {
     cssType: csstype_d_ts_default.content,
-    recipe: recipe_d_ts_default.content,
-    pattern: pattern_d_ts_default.content,
-    parts: parts_d_ts_default.content,
-    composition: composition_d_ts_default.content,
-    selectors: selectors_d_ts_default.content,
-    system: (0, import_ts_pattern9.match)(ctx.jsx.styleProps).with("all", () => system_types_d_ts_default.content).with("minimal", () => system_types_d_ts_default.content.replace(jsxStyleProps, "export type JsxStyleProps = WithCss")).with("none", () => system_types_d_ts_default.content.replace(jsxStyleProps, "export type JsxStyleProps = {}")).exhaustive()
+    recipe: rewriteImports(recipe_d_ts_default.content),
+    pattern: rewriteImports(pattern_d_ts_default.content.replace("../tokens", "../tokens/index")),
+    parts: rewriteImports(parts_d_ts_default.content),
+    composition: rewriteImports(composition_d_ts_default.content),
+    selectors: rewriteImports(selectors_d_ts_default.content),
+    system: rewriteImports(
+      (0, import_ts_pattern9.match)(ctx.jsx.styleProps).with("all", () => system_types_d_ts_default.content).with("minimal", () => system_types_d_ts_default.content.replace(jsxStyleProps, "export type JsxStyleProps = WithCss")).with("none", () => system_types_d_ts_default.content.replace(jsxStyleProps, "export type JsxStyleProps = {}")).exhaustive()
+    )
   };
 }
 
 // src/artifacts/types/main.ts
 var import_outdent39 = require("outdent");
-var generateTypesEntry = () => ({
+var generateTypesEntry = (ctx) => ({
   global: import_outdent39.outdent`
-    import type { RecipeVariantRecord, RecipeConfig, SlotRecipeVariantRecord, SlotRecipeConfig } from './recipe'
-    import type { Parts } from './parts'
-    import type { PatternConfig, PatternProperties } from './pattern'
-    import type { GlobalStyleObject, SystemStyleObject } from './system-types'
-    import type { CompositionStyles } from './composition'
+    // @ts-nocheck
+    import type { TextStyles, LayerStyles } from '@pandacss/dev'
+    ${ctx.file.importType("RecipeVariantRecord, RecipeConfig, SlotRecipeVariantRecord, SlotRecipeConfig", "./recipe")}
+    ${ctx.file.importType("Parts", "./parts")}
+    ${ctx.file.importType("PatternConfig, PatternProperties", "./pattern")}
+    ${ctx.file.importType("GlobalStyleObject, SystemStyleObject", "./system-types")}
+    ${ctx.file.importType("CompositionStyles", "./composition")}
 
     declare module '@pandacss/dev' {
       export function defineRecipe<V extends RecipeVariantRecord>(config: RecipeConfig<V>): RecipeConfig
       export function defineSlotRecipe<S extends string, V extends SlotRecipeVariantRecord<S>>(config: SlotRecipeConfig<S, V>): SlotRecipeConfig
       export function defineStyles(definition: SystemStyleObject): SystemStyleObject
       export function defineGlobalStyles(definition: GlobalStyleObject): GlobalStyleObject
-      export function defineTextStyles(definition: CompositionStyles['textStyles']): CompositionStyles['textStyles']
-      export function defineLayerStyles(definition: CompositionStyles['layerStyles']): CompositionStyles['layerStyles']
+      export function defineTextStyles(definition: CompositionStyles['textStyles']): TextStyles
+      export function defineLayerStyles(definition: CompositionStyles['layerStyles']): LayerStyles
       export function definePattern<T extends PatternProperties>(config: PatternConfig<T>): PatternConfig
       export function defineParts<T extends Parts>(parts: T): (config: Partial<Record<keyof T, SystemStyleObject>>) => Partial<Record<keyof T, SystemStyleObject>>
     }
     `,
   index: import_outdent39.outdent`
-    import './global'
-    export type { ConditionalValue } from './conditions'
-    export type { GlobalStyleObject, JsxStyleProps, SystemStyleObject } from './system-types'
+    import '${ctx.file.extDts("./global")}'
+    ${ctx.file.exportType("ConditionalValue", "./conditions")}
+    ${ctx.file.exportType("GlobalStyleObject, JsxStyleProps, SystemStyleObject", "./system-types")}
 
     `,
   helpers: import_outdent39.outdent`
@@ -2972,9 +2979,9 @@ function generatePropTypes(ctx) {
   const strictText = `${strictTokens ? "" : " | CssValue<T>"}`;
   const result = [
     import_outdent40.outdent`
-    import type { ConditionalValue } from './conditions';
-    import type { CssProperties } from './system-types'
-    import type { Tokens } from '../tokens'
+    ${ctx.file.importType("ConditionalValue", "./conditions")}
+    ${ctx.file.importType("CssProperties", "./system-types")}
+    ${ctx.file.importType("Tokens", "../tokens/index")}
 
     type PropertyValueTypes  = {`
   ];
@@ -3011,9 +3018,9 @@ var import_outdent41 = __toESM(require("outdent"));
 function generateStyleProps(ctx) {
   const props = new Set(import_is_valid_prop.allCssProperties.concat(ctx.utility.keys()).filter(Boolean));
   return import_outdent41.default`
-    import type { ConditionalValue } from './conditions'
-    import type { PropertyValue } from './prop-type'
-    import type { Token } from '../tokens'
+    ${ctx.file.importType("ConditionalValue", "./conditions")}
+    ${ctx.file.importType("PropertyValue", "./prop-type")}
+    ${ctx.file.importType("Token", "../tokens/index")}
 
     export type CssVarProperties = {
       [key in \`--\${string}\`]?: ConditionalValue<Token | (string & {}) | (number & {})>
@@ -3104,9 +3111,9 @@ function setupDesignTokens(ctx) {
     dir: ctx.paths.token,
     files: [
       { file: "index.css", code: css2 },
-      { file: "index.d.ts", code: code.dts },
+      { file: ctx.file.extDts("index"), code: code.dts },
       { file: ctx.file.ext("index"), code: code.js },
-      { file: "tokens.d.ts", code: generateTokenTypes(ctx) }
+      { file: ctx.file.extDts("tokens"), code: generateTokenTypes(ctx) }
     ]
   };
 }
@@ -3114,24 +3121,24 @@ function setupTypes(ctx) {
   const gen = getGeneratedTypes(ctx);
   const conditions = generateConditions(ctx);
   const jsx = generateJsxTypes(ctx);
-  const entry = generateTypesEntry();
+  const entry = generateTypesEntry(ctx);
   return {
     dir: ctx.paths.types,
     files: [
-      jsx ? { file: "jsx.d.ts", code: jsx.jsxType } : null,
-      { file: "csstype.d.ts", code: gen.cssType },
-      { file: "system-types.d.ts", code: gen.system },
-      { file: "selectors.d.ts", code: gen.selectors },
-      { file: "composition.d.ts", code: gen.composition },
-      { file: "global.d.ts", code: entry.global },
-      { file: "helpers.d.ts", code: entry.helpers },
-      { file: "recipe.d.ts", code: gen.recipe },
-      { file: "pattern.d.ts", code: gen.pattern },
-      { file: "parts.d.ts", code: gen.parts },
-      { file: "index.d.ts", code: entry.index },
-      { file: "prop-type.d.ts", code: generatePropTypes(ctx) },
-      { file: "style-props.d.ts", code: generateStyleProps(ctx) },
-      { file: "conditions.d.ts", code: conditions.dts }
+      jsx ? { file: ctx.file.extDts("jsx"), code: jsx.jsxType } : null,
+      { file: ctx.file.extDts("csstype"), code: gen.cssType },
+      { file: ctx.file.extDts("system-types"), code: gen.system },
+      { file: ctx.file.extDts("selectors"), code: gen.selectors },
+      { file: ctx.file.extDts("composition"), code: gen.composition },
+      { file: ctx.file.extDts("global"), code: entry.global },
+      { file: ctx.file.extDts("helpers"), code: entry.helpers },
+      { file: ctx.file.extDts("recipe"), code: gen.recipe },
+      { file: ctx.file.extDts("pattern"), code: gen.pattern },
+      { file: ctx.file.extDts("parts"), code: gen.parts },
+      { file: ctx.file.extDts("index"), code: entry.index },
+      { file: ctx.file.extDts("prop-type"), code: generatePropTypes(ctx) },
+      { file: ctx.file.extDts("style-props"), code: generateStyleProps(ctx) },
+      { file: ctx.file.extDts("conditions"), code: conditions.dts }
     ].filter(Boolean)
   };
 }
@@ -3143,7 +3150,7 @@ function setupCss(ctx) {
     files: [
       { file: ctx.file.ext("conditions"), code: conditions.js },
       { file: ctx.file.ext("css"), code: code.js },
-      { file: "css.d.ts", code: code.dts }
+      { file: ctx.file.extDts("css"), code: code.dts }
     ]
   };
 }
@@ -3155,7 +3162,7 @@ function setupCva(ctx) {
     dir: ctx.paths.css,
     files: [
       { file: ctx.file.ext("cva"), code: code.js },
-      { file: "cva.d.ts", code: code.dts }
+      { file: ctx.file.extDts("cva"), code: code.dts }
     ]
   };
 }
@@ -3167,7 +3174,7 @@ function setupSva(ctx) {
     dir: ctx.paths.css,
     files: [
       { file: ctx.file.ext("sva"), code: code.js },
-      { file: "sva.d.ts", code: code.dts }
+      { file: ctx.file.extDts("sva"), code: code.dts }
     ]
   };
 }
@@ -3177,7 +3184,7 @@ function setupCx(ctx) {
     dir: ctx.paths.css,
     files: [
       { file: ctx.file.ext("cx"), code: code.js },
-      { file: "cx.d.ts", code: code.dts }
+      { file: ctx.file.extDts("cx"), code: code.dts }
     ]
   };
 }
@@ -3187,16 +3194,16 @@ function setupRecipes(ctx) {
     return;
   const indexFiles = files.filter((file) => !file.name.includes("create-recipe"));
   const index = {
-    js: import_outdent43.default.string(indexFiles.map((file) => ctx.file.export(`./${file.name}`)).join("\n")),
-    dts: import_outdent43.default.string(indexFiles.map((file) => `export * from './${file.name}'`).join("\n"))
+    js: import_outdent43.default.string(indexFiles.map((file) => ctx.file.exportStar(`./${file.name}`)).join("\n")),
+    dts: import_outdent43.default.string(indexFiles.map((file) => ctx.file.exportTypeStar(`./${file.name}`)).join("\n"))
   };
   return {
     dir: ctx.paths.recipe,
     files: [
       ...files.map((file) => ({ file: ctx.file.ext(file.name), code: file.js })),
-      ...files.map((file) => ({ file: `${file.name}.d.ts`, code: file.dts })),
+      ...files.map((file) => ({ file: ctx.file.extDts(file.name), code: file.dts })),
       { file: ctx.file.ext("index"), code: index.js },
-      { file: "index.d.ts", code: index.dts }
+      { file: ctx.file.extDts("index"), code: index.dts }
     ]
   };
 }
@@ -3207,16 +3214,16 @@ function setupPatterns(ctx) {
   if (!files)
     return;
   const index = {
-    js: import_outdent43.default.string(files.map((file) => ctx.file.export(`./${file.name}`)).join("\n")),
-    dts: import_outdent43.default.string(files.map((file) => `export * from './${file.name}'`).join("\n"))
+    js: import_outdent43.default.string(files.map((file) => ctx.file.exportStar(`./${file.name}`)).join("\n")),
+    dts: import_outdent43.default.string(files.map((file) => ctx.file.exportTypeStar(`./${file.name}`)).join("\n"))
   };
   return {
     dir: ctx.paths.pattern,
     files: [
       ...files.map((file) => ({ file: ctx.file.ext(file.name), code: file.js })),
-      ...files.map((file) => ({ file: `${file.name}.d.ts`, code: file.dts })),
+      ...files.map((file) => ({ file: ctx.file.extDts(file.name), code: file.dts })),
       { file: ctx.file.ext("index"), code: index.js },
-      { file: "index.d.ts", code: index.dts }
+      { file: ctx.file.extDts("index"), code: index.dts }
     ]
   };
 }
@@ -3229,51 +3236,54 @@ function setupJsx(ctx) {
   const patterns = generateJsxPatterns(ctx);
   const index = {
     js: import_outdent43.default`
-  ${ctx.file.export("./factory")}
-  ${isValidProp?.js ? ctx.file.export("./is-valid-prop") : ""}
-  ${import_outdent43.default.string(patterns.map((file) => ctx.file.export(`./${file.name}`)).join("\n"))}
+  ${ctx.file.exportStar("./factory")}
+  ${isValidProp?.js ? ctx.file.exportStar("./is-valid-prop") : ""}
+  ${import_outdent43.default.string(patterns.map((file) => ctx.file.exportStar(`./${file.name}`)).join("\n"))}
   `,
     dts: import_outdent43.default`
-  export * from './factory'
-  ${isValidProp?.dts ? `export * from './is-valid-prop'` : ""}
-  ${import_outdent43.default.string(patterns.map((file) => `export * from './${file.name}'`).join("\n"))}
-  export type { ${ctx.jsx.typeName} } from '../types/jsx'
+  ${ctx.file.exportTypeStar("./factory")}
+  
+  ${isValidProp?.dts ? ctx.file.exportTypeStar("./is-valid-prop") : ""}
+  
+  ${import_outdent43.default.string(patterns.map((file) => ctx.file.exportTypeStar(`./${file.name}`)).join("\n"))}
+  
+  ${ctx.file.exportType(ctx.jsx.typeName, "../types/jsx")}
     `
   };
   return {
     dir: ctx.paths.jsx,
     files: [
       ...patterns.map((file) => ({ file: ctx.file.ext(file.name), code: file.js })),
-      ...patterns.map((file) => ({ file: `${file.name}.d.ts`, code: file.dts })),
+      ...patterns.map((file) => ({ file: ctx.file.extDts(file.name), code: file.dts })),
       { file: ctx.file.ext("is-valid-prop"), code: isValidProp?.js },
-      { file: "is-valid-prop.d.ts", code: isValidProp?.dts },
-      { file: "factory.d.ts", code: types.jsxFactory },
+      { file: ctx.file.extDts("is-valid-prop"), code: isValidProp?.dts },
       { file: ctx.file.ext("factory"), code: factory?.js },
-      { file: "index.d.ts", code: index.dts },
-      { file: ctx.file.ext("index"), code: index.js }
+      { file: ctx.file.extDts("factory"), code: types.jsxFactory },
+      { file: ctx.file.ext("index"), code: index.js },
+      { file: ctx.file.extDts("index"), code: index.dts }
     ]
   };
 }
 function setupCssIndex(ctx) {
   const index = {
     js: import_outdent43.default`
-  ${ctx.file.export("./css")}
-  ${ctx.file.export("./cx")}
-  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.export("./cva")}
-  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.export("./sva")}
+  ${ctx.file.exportStar("./css")}
+  ${ctx.file.exportStar("./cx")}
+  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.exportStar("./cva")}
+  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.exportStar("./sva")}
  `,
     dts: import_outdent43.default`
-  export * from './css'
-  export * from './cx'
-  ${ctx.isTemplateLiteralSyntax ? "" : `export * from './cva'`}
-  ${ctx.isTemplateLiteralSyntax ? "" : `export * from './sva'`}
+  ${ctx.file.exportTypeStar("./css")}
+  ${ctx.file.exportTypeStar("./cx")}
+  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.exportTypeStar("./cva")}
+  ${ctx.isTemplateLiteralSyntax ? "" : ctx.file.exportTypeStar("./sva")}
   `
   };
   return {
     dir: ctx.paths.css,
     files: [
       { file: ctx.file.ext("index"), code: index.js },
-      { file: "index.d.ts", code: index.dts }
+      { file: ctx.file.extDts("index"), code: index.dts }
     ]
   };
 }
@@ -3324,7 +3334,7 @@ var generateArtifacts = (ctx) => () => {
   ].filter(Boolean).map((artifact) => {
     const files = artifact?.files ?? [];
     files.forEach((file) => {
-      if (file.file.endsWith(".d.ts")) {
+      if (ctx.file.isTypeFile(file.file)) {
         file.code = `/* eslint-disable */
 ${file.code}`;
       }
@@ -3414,7 +3424,7 @@ var generateParserCss = (ctx) => (result) => (0, import_func.pipe)(
         for (const pattern of patternSet) {
           (0, import_ts_pattern10.match)(pattern).with({ type: "jsx-pattern", name: import_ts_pattern10.P.string }, ({ name: jsxName }) => {
             pattern.data.forEach((data) => {
-              const fnName = patterns.getFnName(jsxName);
+              const fnName = patterns.find(jsxName);
               const styleProps = patterns.transform(fnName, data);
               sheet.processStyleProps(styleProps);
             });
@@ -3613,8 +3623,8 @@ var getPatternEngine = (config) => {
     },
     getNames,
     details,
-    getFnName: (0, import_shared7.memo)((jsxName) => {
-      return details.find((node) => node.jsxName === jsxName)?.baseName ?? (0, import_shared7.uncapitalize)(jsxName);
+    find: (0, import_shared7.memo)((jsxName) => {
+      return details.find((node) => node.match.test(jsxName))?.baseName ?? (0, import_shared7.uncapitalize)(jsxName);
     }),
     filter: (0, import_shared7.memo)((jsxName) => {
       return details.filter((node) => node.match.test(jsxName));
@@ -3624,23 +3634,46 @@ var getPatternEngine = (config) => {
 };
 
 // src/engines/index.ts
-var getEngine = (conf) => ({
-  ...getBaseEngine(conf),
-  patterns: getPatternEngine(conf.config),
-  jsx: getJsxEngine(conf.config),
-  paths: getPathEngine(conf.config),
-  file: {
-    ext(file) {
-      return `${file}.${conf.config.outExtension}`;
-    },
-    import(mod, file) {
-      return `import { ${mod} } from '${this.ext(file)}';`;
-    },
-    export(file) {
-      return `export * from '${this.ext(file)}';`;
+var getEngine = (conf) => {
+  const { config } = conf;
+  const { forceConsistentTypeExtension, outExtension } = config;
+  return {
+    ...getBaseEngine(conf),
+    patterns: getPatternEngine(config),
+    jsx: getJsxEngine(config),
+    paths: getPathEngine(config),
+    file: {
+      ext(file) {
+        return `${file}.${outExtension}`;
+      },
+      extDts(file) {
+        const dts = outExtension === "mjs" && forceConsistentTypeExtension ? "d.mts" : "d.ts";
+        return `${file}.${dts}`;
+      },
+      __extDts(file) {
+        return forceConsistentTypeExtension ? this.extDts(file) : file;
+      },
+      import(mod, file) {
+        return `import { ${mod} } from '${this.ext(file)}';`;
+      },
+      importType(mod, file) {
+        return `import type { ${mod} } from '${this.__extDts(file)}';`;
+      },
+      exportType(mod, file) {
+        return `export type { ${mod} } from '${this.__extDts(file)}';`;
+      },
+      exportStar(file) {
+        return `export * from '${this.ext(file)}';`;
+      },
+      exportTypeStar(file) {
+        return `export * from '${this.__extDts(file)}';`;
+      },
+      isTypeFile(file) {
+        return file.endsWith(".d.ts") || file.endsWith(".d.mts");
+      }
     }
-  }
-});
+  };
+};
 
 // src/generator.ts
 var defaults = (conf) => ({