jiek 2.2.5 → 2.2.7-alpha.1

package/src/commands/publish.ts

@@ -7,12 +7,16 @@ 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 { 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' {
@@ -108,27 +112,44 @@ async function prepublish({ bumper }: {
   )
 
   const generateNewManifest = (dir: string, manifest: NonNullable<ProjectsGraph['value']>[string]) => {
-    const { name, type, exports: entrypoints = {} } = manifest
+    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),
       dir,
-      defaultOutdir: outdir,
       noFilter: true,
       isPublish: true
+    } satisfies Partial<ResolveExportsOptions>
+    const [resolvedEntrypoints, exports, resolvedOutdir] = resolveExports({
+      entrypoints,
+      defaultOutdir: outdir,
+      ...commonOptions
     })
     newManifest.exports = {
       ...resolvedEntrypoints,
       ...exports
     }
+    const [resolvedInternalEntrypoints, imports] = resolveExports({
+      entrypoints: internalEntrypoints,
+      defaultOutdir: `${outdir}/.internal`,
+      ...commonOptions
+    })
+    newManifest.imports = {
+      ...resolvedInternalEntrypoints,
+      ...imports
+    }
     return [newManifest, resolvedOutdir] as const
   }
 
@@ -146,26 +167,33 @@ 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'
+        ]
+      }
+    })
+    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 +235,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(
@@ -434,19 +466,57 @@ async function prepublish({ bumper }: {
       }
       throw new Error(`file type of ${path} is not supported`)
     }
+
+    if ('imports' in manifest && manifest.imports) {
+      Object
+        .entries(manifest.imports)
+        .forEach(([key, value]) => {
+          if (typeof value !== 'object') return
+          const [start] = key.split('*')
+          manifest.imports![key] = JSON.parse(
+            JSON
+              .stringify(value)
+              .replaceAll(`${resolvedOutdir}/.internal/`, start)
+          )
+        })
+      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
+        )
+      )
+    }
   })
 }
 
 async function postpublish() {
   await forEachSelectedProjectsGraphEntries(dir => {
     const jiekTempDir = path.resolve(dir, 'node_modules/.jiek/.tmp')
-    const packageJSON = path.resolve(dir, 'package.json')
-    const jiekTempPackageJSON = path.resolve(jiekTempDir, 'package.json')
-    if (fs.existsSync(jiekTempPackageJSON)) {
-      fs.copyFileSync(jiekTempPackageJSON, packageJSON)
-      fs.rmSync(jiekTempPackageJSON)
-      // eslint-disable-next-line no-console
+    const packageJSONPath = path.resolve(dir, 'package.json')
+    const { name, version } = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8')) as {
+      name: string
+      version: string
+    }
+    const jiekTempPackageJSONPath = path.resolve(jiekTempDir, 'package.json')
+    if (fs.existsSync(jiekTempPackageJSONPath)) {
+      fs.copyFileSync(jiekTempPackageJSONPath, packageJSONPath)
+      fs.rmSync(jiekTempPackageJSONPath)
+      /* eslint-disable no-console */
       console.log(`${dir}/package.json has been restored`)
+      console.log(
+        `if you want to check the compatibility of the package, you can visit: https://arethetypeswrong.github.io/?p=${name}%40${version}`
+      )
+      /* eslint-enable no-console */
     } else {
       throw new Error(
         `jiek temp \`${dir}/package.json\` not found, please confirm the jiek pre-publish command has been executed`

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'
   }