jiek 2.2.6 → 2.2.7-alpha.3

package/src/commands/publish.ts

@@ -7,15 +7,27 @@ import process from 'node:process'
 import { type BumperType, TAGS, bump } from '@jiek/utils/bumper'
 import { program } from 'commander'
 import detectIndent from 'detect-indent'
+import type { Config } from 'jiek'
+import type { JSONPath } from 'jsonc-parser'
 import { applyEdits, modify } from 'jsonc-parser'
 
-import type { ProjectsGraph } from '../utils/filterSupport'
-import { getSelectedProjectsGraph } from '../utils/filterSupport'
-import { getExports } from '../utils/getExports'
-import { loadConfig } from '../utils/loadConfig'
+import type { ProjectsGraph } from '#~/utils/filterSupport'
+import { getSelectedProjectsGraph } from '#~/utils/filterSupport'
+import { loadConfig } from '#~/utils/loadConfig'
+import type { ResolveExportsOptions } from '#~/utils/resolveExports'
+import { resolveExports } from '#~/utils/resolveExports'
+
+import { getInternalModuleName } from '#~/utils/getInternalModuleName'
 import { outdirDescription } from './descriptions'
 
 declare module 'jiek' {
+  interface ConfigExperimental {
+    /**
+     * Polyfill `imports` fields in package.json to local dependencies and exports fields.
+     * @default false
+     */
+    importsDowngrade?: boolean
+  }
   export interface Config {
     publish?: {
       /**
@@ -107,37 +119,71 @@ async function prepublish({ bumper }: {
     bumperEnv ? JSON.parse(bumperEnv) as string | boolean : false
   )
 
-  const generateNewManifest = (dir: string, manifest: NonNullable<ProjectsGraph['value']>[string]) => {
-    const { name, type, exports: entrypoints = {} } = manifest
+  const generateNewManifest = (
+    dir: string,
+    manifest: NonNullable<ProjectsGraph['value']>[string],
+    config: Config
+  ) => {
+    const {
+      name,
+      type,
+      exports: entrypoints,
+      imports: internalEntrypoints
+    } = manifest
     if (!name) {
       throw new Error(`package.json in ${dir} must have a name field`)
     }
 
     const pkgIsModule = type === 'module'
     const newManifest = { ...manifest }
-    const [resolvedEntrypoints, exports, resolvedOutdir] = getExports({
-      entrypoints,
+    const commonOptions = {
       pkgIsModule,
       pkgName: name,
-      config: loadConfig(dir),
+      config,
       dir,
-      defaultOutdir: outdir,
       noFilter: true,
       isPublish: true
-    })
-    newManifest.exports = {
-      ...resolvedEntrypoints,
-      ...exports
+    } satisfies Partial<ResolveExportsOptions>
+    let resolvedOutdir = outdir
+    if (entrypoints) {
+      const [resolvedEntrypoints, exports, _resolvedOutdir] = resolveExports({
+        entrypoints,
+        defaultOutdir: outdir,
+        ...commonOptions
+      })
+      newManifest.exports = {
+        ...resolvedEntrypoints,
+        ...exports
+      }
+      if (resolvedOutdir === outdir) {
+        resolvedOutdir = _resolvedOutdir
+      }
+    }
+    if (internalEntrypoints) {
+      const [resolvedInternalEntrypoints, imports, _resolvedOutdir] = resolveExports({
+        entrypoints: internalEntrypoints,
+        defaultOutdir: `${outdir}/.internal`,
+        ...commonOptions
+      })
+      newManifest.imports = {
+        ...resolvedInternalEntrypoints,
+        ...imports
+      }
+      if (resolvedOutdir === outdir) {
+        resolvedOutdir = _resolvedOutdir
+      }
     }
     return [newManifest, resolvedOutdir] as const
   }
 
   const generateNewPackageJSONString = ({
+    config,
     oldJSONString,
     oldJSON,
     manifest,
     formattingOptions
   }: {
+    config: Config
     oldJSONString: string
     oldJSON: Record<string, unknown>
     manifest: NonNullable<ProjectsGraph['value']>[string]
@@ -146,26 +192,35 @@ async function prepublish({ bumper }: {
       insertSpaces: boolean
     }
   }) => {
+    const internalModuleName = getInternalModuleName(manifest.name!)
+
     let newJSONString = oldJSONString
-    newJSONString = applyEdits(
-      newJSONString,
-      modify(
+    const update = (path: JSONPath, value: unknown) => {
+      newJSONString = applyEdits(
         newJSONString,
-        ['publishConfig', 'typesVersions'],
-        {
-          '<5.0': {
-            '*': [
-              '*',
-              `./*`,
-              `./*/index.d.ts`,
-              `./*/index.d.mts`,
-              `./*/index.d.cts`
-            ]
-          }
-        },
-        { formattingOptions }
+        modify(newJSONString, path, value, { formattingOptions })
       )
-    )
+    }
+
+    update(['publishConfig', 'typesVersions'], {
+      '<5.0': {
+        '*': [
+          '*',
+          './*',
+          './*/index.d.ts',
+          './*/index.d.mts',
+          './*/index.d.cts'
+        ]
+      }
+    })
+    if (config.experimental?.importsDowngrade) {
+      update(['dependencies', internalModuleName], `file:./${outdir}/.internal`)
+      update(['dependenciesMeta', internalModuleName], {
+        'injected': true
+      })
+      update(['imports'], undefined)
+    }
+
     for (const [key, value] of Object.entries(manifest)) {
       if (key === 'version') continue
       if (JSON.stringify(value) === JSON.stringify(oldJSON[key])) continue
@@ -207,9 +262,13 @@ async function prepublish({ bumper }: {
               const indexExports = index as Record<string, string>
               indexPublishConfig.main = indexExports.require ?? indexExports.default
               indexPublishConfig.module = indexExports.import ?? indexExports.module ?? indexExports.default
+              indexPublishConfig.types = indexExports.types
               break
             }
           }
+          indexPublishConfig.types = indexPublishConfig[
+            manifest?.type === 'module' ? 'module' : 'main'
+          ].replace(/\.([cm]?)js$/, '.d.$1ts')
           for (const [k, v] of Object.entries(indexPublishConfig)) {
             if (v === undefined) continue
             newJSONString = applyEdits(
@@ -269,7 +328,8 @@ async function prepublish({ bumper }: {
   }
 
   await forEachSelectedProjectsGraphEntries((dir, originalManifest) => {
-    const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest)
+    const config = loadConfig(dir)
+    const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest, config)
     const resolveByDir = (...paths: string[]) => path.resolve(dir, ...paths)
 
     const oldJSONString = fs.readFileSync(resolveByDir('package.json'), 'utf-8')
@@ -294,6 +354,7 @@ async function prepublish({ bumper }: {
     )
 
     const newJSONString = generateNewPackageJSONString({
+      config,
       oldJSONString: modifyVersionPackageJSON,
       oldJSON: {
         ...oldJSON,
@@ -434,6 +495,25 @@ async function prepublish({ bumper }: {
       }
       throw new Error(`file type of ${path} is not supported`)
     }
+
+    if (config.experimental?.importsDowngrade && 'imports' in manifest && manifest.imports) {
+      fs.writeFileSync(
+        resolveByDir(resolvedOutdir, resolvedOutdir, '.internal', 'package.json'),
+        JSON.stringify(
+          {
+            name: getInternalModuleName(manifest.name!),
+            exports: JSON.parse(
+              JSON
+                .stringify(manifest.imports)
+                .replaceAll('#', './')
+                .replaceAll('~', '')
+            ) as Record<string, unknown>
+          },
+          null,
+          2
+        )
+      )
+    }
   })
 }
 

package/src/index.ts

@@ -2,6 +2,11 @@ import type {} from './commands/base'
 import type {} from './commands/build'
 import type {} from './commands/publish'
 
-export interface Config {}
+export interface ConfigExperimental {
+}
+
+export interface Config {
+  experimental?: ConfigExperimental
+}
 
 export const defineConfig = (config: Config) => config

package/src/rollup/base.ts

@@ -54,9 +54,9 @@ export interface TemplateOptions {
      * When use esbuild type builder, it will inject `supported.import-attributes` option.
      * When use swc type builder, it will inject `jsc.experimental.keepImportAttributes` option.
      *
-     * And it will auto set the rollup output externalImportAttributes and importAttributesKey options.
+     * And it will auto set the rollup output `externalImportAttributes` and `importAttributesKey` options.
      *
-     * @default true
+     * @default false
      */
     keepImportAttributes?: boolean | 'assert'
   }