jiek 2.2.7 → 2.3.1

package/src/commands/publish.ts

@@ -5,17 +5,29 @@ import path from 'node:path'
 import process from 'node:process'
 
 import { type BumperType, TAGS, bump } from '@jiek/utils/bumper'
-import { program } from 'commander'
+import { type Command, 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?: {
       /**
@@ -48,17 +60,33 @@ async function forEachSelectedProjectsGraphEntries(
   }
 }
 
-program
-  .command('publish')
-  .description(description)
-  .aliases(['pub', 'p'])
-  .option('-b, --bumper <bumper>', 'bump version', 'patch')
-  .option('-no-b, --no-bumper', 'no bump version')
-  .option('-o, --outdir <OUTDIR>', outdirDescription, String, 'dist')
-  .action(async ({ outdir, bumper }: {
-    outdir?: string
-    bumper: false | BumperType
-  }) => {
+interface PublishOptions {
+  outdir?: string
+  bumper: false | BumperType
+  /**
+   * Skip entries which end with '.js'.
+   */
+  skipJS: boolean
+}
+
+const attachPublishOptions = (command: Command) =>
+  command
+    .option('-b, --bumper <bumper>', 'bump version', 'patch')
+    .option('-no-b, --no-bumper', 'no bump version')
+    .option('-o, --outdir <OUTDIR>', outdirDescription, String, 'dist')
+    .option('--skipJS', 'skip entries which end with ".js"')
+
+attachPublishOptions(
+  program
+    .command('publish')
+    .description(description)
+    .aliases(['pub', 'p'])
+)
+  .action(async ({
+    outdir,
+    bumper,
+    skipJS
+  }: PublishOptions) => {
     let shouldPassThrough = false
 
     const passThroughOptions = process.argv
@@ -87,18 +115,21 @@ program
         env: {
           ...process.env,
           JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
-          JIEK_PUBLISH_BUMPER: JSON.stringify(bumper)
+          JIEK_PUBLISH_BUMPER: JSON.stringify(bumper),
+          JIEK_PUBLISH_SKIP_JS: JSON.stringify(skipJS)
         }
       })
     })
   })
 
-async function prepublish({ bumper }: {
-  bumper?: boolean | BumperType
-} = {}) {
+async function prepublish({
+  bumper,
+  skipJS
+}: PublishOptions) {
   const {
     JIEK_PUBLISH_OUTDIR: outdirEnv,
-    JIEK_PUBLISH_BUMPER: bumperEnv
+    JIEK_PUBLISH_BUMPER: bumperEnv,
+    JIEK_PUBLISH_SKIP_JS: skipJSEnv
   } = process.env
   const outdir = outdirEnv
     ? JSON.parse(outdirEnv) as string
@@ -106,38 +137,76 @@ async function prepublish({ bumper }: {
   bumper = bumper ?? (
     bumperEnv ? JSON.parse(bumperEnv) as string | boolean : false
   )
+  skipJS = skipJS ?? (
+    skipJSEnv ? JSON.parse(skipJSEnv) as boolean : undefined
+  )
 
-  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
+      isPublish: true,
+      skipJS: skipJS ?? config.skipJS
+    } 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 +215,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
@@ -273,7 +351,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')
@@ -290,7 +369,7 @@ async function prepublish({ bumper }: {
     }
 
     const newVersion = bumper
-      ? bump(oldJSON.version, bumper === true ? 'patch' : bumper)
+      ? bump(oldJSON.version, bumper)
       : oldJSON.version
     const modifyVersionPackageJSON = applyEdits(
       oldJSONString,
@@ -298,6 +377,7 @@ async function prepublish({ bumper }: {
     )
 
     const newJSONString = generateNewPackageJSONString({
+      config,
       oldJSONString: modifyVersionPackageJSON,
       oldJSON: {
         ...oldJSON,
@@ -438,10 +518,35 @@ 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
+        )
+      )
+    }
+
+    const jiekProductionTag = path.resolve(resolvedOutdir, '.jiek-production-tag')
+    if (!fs.existsSync(jiekProductionTag)) {
+      fs.writeFileSync(jiekProductionTag, '')
+    }
   })
 }
 
-async function postpublish() {
+// eslint-disable-next-line no-empty-pattern
+async function postpublish({}: PublishOptions) {
   await forEachSelectedProjectsGraphEntries(dir => {
     const jiekTempDir = path.resolve(dir, 'node_modules/.jiek/.tmp')
     const packageJSONPath = path.resolve(dir, 'package.json')
@@ -467,24 +572,6 @@ async function postpublish() {
   })
 }
 
-program
-  .action(async () => {
-    const {
-      npm_lifecycle_event: NPM_LIFECYCLE_EVENT
-    } = process.env
-    // eslint-disable-next-line ts/switch-exhaustiveness-check
-    switch (NPM_LIFECYCLE_EVENT) {
-      case 'prepublish':
-        await prepublish()
-        break
-      case 'postpublish':
-        await postpublish()
-        break
-      default:
-        program.help()
-    }
-  })
-
 const prepublishDescription = `
 Prepare package.json for publish, you can add \`jk\` to the \`prepublish\` script in package.json, the command will automatically run \`jk prepublish\`.
 .e.g
@@ -494,11 +581,11 @@ Prepare package.json for publish, you can add \`jk\` to the \`prepublish\` scrip
   }
 }
 `.trim()
-program
-  .command('prepublish')
-  .description(prepublishDescription)
-  .option('-b, --bumper <bumper>', 'bump version')
-  .option('-no-b, --no-bumper', 'no bump version')
+attachPublishOptions(
+  program
+    .command('prepublish')
+    .description(prepublishDescription)
+)
   .action(prepublish)
 
 const postpublishDescription = `
@@ -510,7 +597,32 @@ Restore package.json after publish, you can add \`jk\` to the \`postpublish\` sc
   }
 }
 `.trim()
-program
-  .command('postpublish')
-  .description(postpublishDescription)
+attachPublishOptions(
+  program
+    .command('postpublish')
+    .description(postpublishDescription)
+)
   .action(postpublish)
+
+const {
+  npm_lifecycle_event: NPM_LIFECYCLE_EVENT
+} = process.env
+
+if (
+  NPM_LIFECYCLE_EVENT && [
+    'prepublish',
+    'postpublish'
+  ].includes(NPM_LIFECYCLE_EVENT)
+) {
+  attachPublishOptions(program)
+    .action(async (options: PublishOptions) => {
+      switch (NPM_LIFECYCLE_EVENT) {
+        case 'prepublish':
+          await prepublish(options)
+          break
+        case 'postpublish':
+          await postpublish(options)
+          break
+      }
+    })
+}

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