jiek 2.2.7 → 2.3.1

package/src/rollup/plugins/with-external.ts

@@ -0,0 +1,23 @@
+import type { PluginImpl } from 'rollup'
+
+export default (() => ({
+  name: 'jiek:with-external',
+  resolveId: {
+    order: 'pre',
+    handler: (source, _, { attributes }) => {
+      if (
+        'external' in attributes || 'bundle' in attributes
+      ) {
+        delete attributes.external
+        delete attributes.bundle
+        return {
+          id: source,
+          external: attributes.external === 'true'
+            ? true
+            : attributes.bundle !== 'true',
+          attributes
+        }
+      }
+    }
+  }
+})) as PluginImpl<{}>

package/src/rollup/utils/externalResolver.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs'
 import { builtinModules } from 'node:module'
+import process from 'node:process'
 
 const EXCLUDE_SUFFIX = [
   'te?xt',
@@ -7,21 +8,32 @@ const EXCLUDE_SUFFIX = [
   '(css|s[ac]ss|less|styl)'
 ]
 
-export default function(json: Record<string, unknown>): (string | RegExp)[]
+export interface PackageJSON {
+  name: string
+  type?: string
+  bin?: string | Record<string, string>
+  exports?: Record<string, unknown> | string | string[]
+  imports?: Record<string, unknown>
+  dependencies?: Record<string, unknown>
+  peerDependencies?: Record<string, unknown>
+  optionalDependencies?: Record<string, unknown>
+}
+
+export default function(json: PackageJSON): (string | RegExp)[]
 export default function(path?: string): (string | RegExp)[]
-export default function(jsonOrPath: string | Record<string, unknown> = process.cwd()): (string | RegExp)[] {
-  const pkg = typeof jsonOrPath === 'string'
+export default function(jsonOrPath: string | PackageJSON = process.cwd()): (string | RegExp)[] {
+  const pkg: PackageJSON = typeof jsonOrPath === 'string'
     ? fs.existsSync(`${jsonOrPath}/package.json`)
-      ? JSON.parse(fs.readFileSync(`${jsonOrPath}/package.json`, 'utf-8'))
-      : {}
+      ? JSON.parse(fs.readFileSync(`${jsonOrPath}/package.json`, 'utf-8')) as PackageJSON
+      : {} as PackageJSON
     : jsonOrPath
   const { name, dependencies = {}, peerDependencies = {}, optionalDependencies = {} } = pkg
-  if (!name) {
+  if (name == null) {
     throw new Error('package.json must have a name field')
   }
 
-  const external = <(string | RegExp)[]> Object
-    .keys(dependencies)
+  const external = (<(string | RegExp)[]> [])
+    .concat(Object.keys(dependencies))
     .concat(Object.keys(peerDependencies))
     .concat(Object.keys(optionalDependencies))
     .concat(builtinModules)

package/src/utils/checkDependency.ts

@@ -3,7 +3,7 @@ import process from 'node:process'
 
 import { confirm } from '@inquirer/prompts'
 
-import { getWD } from '#~/utils/getWD.ts'
+import { getWD } from '#~/utils/getWD'
 
 export async function checkDependency(dependency: string) {
   try {

package/src/utils/filterSupport.ts

@@ -1,11 +1,12 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import process from 'node:process'
 
 import { program } from 'commander'
 import { load } from 'js-yaml'
 
-import { getRoot } from '#~/utils/getRoot.ts'
-import { getWD } from '#~/utils/getWD.ts'
+import { getRoot } from '#~/utils/getRoot'
+import { getWD } from '#~/utils/getWD'
 
 export let type = ''
 
@@ -14,14 +15,16 @@ try {
   type = 'pnpm'
 } catch { /* empty */ }
 
+export interface Manifest {
+  name?: string
+  type?: string
+  exports?: string | string[] | Record<string, unknown>
+  imports?: Record<string, unknown>
+}
+
 export interface ProjectsGraph {
-  wd: string
   root?: string
-  value?: Record<string, {
-    name?: string
-    type?: string
-    exports?: string | string[] | Record<string, unknown>
-  }>
+  value?: Record<string, Manifest>
 }
 
 export async function filterPackagesGraph(filters: string[]): Promise<ProjectsGraph[]> {
@@ -29,16 +32,15 @@ export async function filterPackagesGraph(filters: string[]): Promise<ProjectsGr
 }
 
 export async function getSelectedProjectsGraph(
-  filter = program.getOptionValue('filter')
+  filter = program.getOptionValue('filter') as string | undefined
 ): Promise<ProjectsGraph> {
   const { wd, notWorkspace } = getWD()
   let root = getRoot()
   if (notWorkspace) {
     return {
-      wd,
       root,
       value: {
-        [wd]: JSON.parse(fs.readFileSync(path.resolve(wd, 'package.json'), 'utf-8'))
+        [wd]: JSON.parse(fs.readFileSync(path.resolve(wd, 'package.json'), 'utf-8')) as Manifest
       }
     }
   }
@@ -48,20 +50,20 @@ export async function getSelectedProjectsGraph(
     const pnpmWorkspace = load(pnpmWorkspaceFileContent) as {
       packages: string[]
     }
-    if (root === wd && !filter) {
+    if (root === wd && (filter == null)) {
       throw new Error('root path is workspace root, please provide a filter')
       // TODO inquirer prompt support user select packages
     }
     if (root === undefined) {
       root = process.cwd()
     }
-    if (root !== wd && !filter) {
+    if (root !== wd && (filter == null)) {
       const packageJSONIsExist = fs.existsSync(path.resolve(root, 'package.json'))
       if (!packageJSONIsExist) {
         throw new Error('root path is not workspace root, please provide a filter')
       }
-      const packageJSON = JSON.parse(fs.readFileSync(path.resolve(root, 'package.json'), 'utf-8'))
-      if (!packageJSON.name) {
+      const packageJSON = JSON.parse(fs.readFileSync(path.resolve(root, 'package.json'), 'utf-8')) as Manifest
+      if (packageJSON.name == null) {
         throw new Error('root path is not workspace root, please provide a filter')
       }
       filter = packageJSON.name
@@ -76,7 +78,6 @@ export async function getSelectedProjectsGraph(
       patterns: pnpmWorkspace.packages
     })
     return {
-      wd,
       root,
       value: Object.entries(selectedProjectsGraph)
         .reduce((acc, [key, value]) => {

package/src/utils/getInternalModuleName.ts

@@ -0,0 +1,5 @@
+export const getInternalModuleName = (pkgName: string) => (`${
+  (
+    pkgName.startsWith('@') ? pkgName : `@${pkgName}`
+  ).replace('/', '+')
+}/__internal__`)

package/src/utils/intersection.ts

@@ -0,0 +1 @@
+export const intersection = <T>(a: Iterable<T>, b: Set<T>) => new Set([...a].filter(i => b.has(i)))

package/src/utils/{recusiveListFiles.ts → recursiveListFiles.ts}

@@ -1,13 +1,13 @@
 import fs from 'node:fs'
 import { resolve } from 'node:path'
 
-export const recusiveListFiles = (dir: string): string[] =>
+export const recursiveListFiles = (dir: string): string[] =>
   fs.readdirSync(dir).reduce((acc, file) => {
     const filePath = resolve(dir, file)
     if (fs.statSync(filePath).isDirectory()) {
       if (filePath.endsWith('/node_modules')) return acc
 
-      return [...acc, ...recusiveListFiles(filePath)]
+      return [...acc, ...recursiveListFiles(filePath)]
     }
     return [...acc, filePath]
   }, [] as string[])

package/src/utils/{getExports.ts → resolveExports.ts}

@@ -4,15 +4,15 @@ import process from 'node:process'
 import {
   type Entrypoints2ExportsOptions,
   type RecursiveRecord,
-  DEFAULT_SKIP_VALUES,
   entrypoints2Exports,
   filterLeafs,
+  getDefaultSkipValues,
   resolveEntrypoints
 } from '@jiek/pkger/entrypoints'
 import type { Config } from 'jiek'
 import { isMatch } from 'micromatch'
 
-const intersection = <T>(a: Set<T>, b: Set<T>) => new Set([...a].filter(i => b.has(i)))
+import { intersection } from '#~/utils/intersection'
 
 const {
   JIEK_OUT_DIR,
@@ -58,19 +58,7 @@ export function getOutDirs({
   }
 }
 
-export function getExports({
-  entrypoints,
-  pkgName,
-  pkgIsModule,
-  entries,
-  config,
-  dir,
-  defaultOutdir = OUTDIR,
-  // FIXME dts support
-  outdir = getOutDirs({ pkgName, defaultOutdir, config, cwd: dir }).js,
-  noFilter,
-  isPublish
-}: {
+export interface ResolveExportsOptions {
   entrypoints: string | string[] | Record<string, unknown>
   pkgName: string
   pkgIsModule: boolean
@@ -81,7 +69,23 @@ export function getExports({
   defaultOutdir?: string
   noFilter?: boolean
   isPublish?: boolean
-}) {
+  skipJS?: boolean
+}
+
+export function resolveExports({
+  entrypoints,
+  pkgName,
+  pkgIsModule,
+  entries,
+  config,
+  dir,
+  defaultOutdir = OUTDIR,
+  // FIXME dts support
+  outdir = getOutDirs({ pkgName, defaultOutdir, config, cwd: dir }).js,
+  noFilter,
+  isPublish,
+  skipJS
+}: ResolveExportsOptions) {
   const {
     build = {},
     publish: {
@@ -92,7 +96,9 @@ export function getExports({
   const {
     crossModuleConvertor = crossModuleConvertorDefault
   } = build
-  const [, resolvedEntrypoints] = resolveEntrypoints(entrypoints)
+  const [, resolvedEntrypoints] = resolveEntrypoints(entrypoints, {
+    allowJS: !skipJS
+  })
   if (entries) {
     Object
       .entries(resolvedEntrypoints)
@@ -108,7 +114,9 @@ export function getExports({
       skipValue: [
         // ignore values that filename starts with `.jk-noentry`
         /(^|\/)\.jk-noentry/,
-        ...DEFAULT_SKIP_VALUES
+        ...getDefaultSkipValues({
+          allowJS: !skipJS
+        })
       ]
     }
   )
@@ -149,7 +157,8 @@ export function getExports({
       withSource: isPublish ? withSource : undefined,
       withConditional: {
         ...crossModuleWithConditional
-      }
+      },
+      allowJS: !skipJS
     }),
     outdir
   ] as const

package/bin/jiek-build.js

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-import { existsSync } from 'node:fs'
-import { createRequire } from 'node:module'
-import { dirname, resolve } from 'node:path'
-import process from 'node:process'
-
-process.env.JIEK_IS_ONLY_BUILD = 'true'
-
-const __dirname = dirname(import.meta.url.replace('file://', ''))
-if (existsSync(resolve(__dirname, '../.jiek-dev-tag'))) {
-  const require = createRequire(import.meta.url)
-  require('esbuild-register')
-  require('../src/cli-only-build.ts')
-} else {
-  import('jiek/cli-only-build')
-}

package/bin/jiek.js

@@ -1,13 +0,0 @@
-#!/usr/bin/env node
-import { existsSync } from 'node:fs'
-import { createRequire } from 'node:module'
-import { dirname, resolve } from 'node:path'
-
-const __dirname = dirname(import.meta.url.replace('file://', ''))
-if (existsSync(resolve(__dirname, '../.jiek-dev-tag'))) {
-  const require = createRequire(import.meta.url)
-  require('esbuild-register')
-  require('../src/cli.ts')
-} else {
-  import('jiek/cli')
-}

package/cli/package.json

@@ -1 +0,0 @@
-{"type":"module","module":"../dist/cli.js","main":"../dist/cli.cjs"}

package/cli-only-build/package.json

@@ -1 +0,0 @@
-{"type":"module","module":"../dist/cli-only-build.js","main":"../dist/cli-only-build.cjs"}

package/dist/cli.d.cts

@@ -1,14 +0,0 @@
-declare module 'jiek' {
-    interface Config {
-        publish?: {
-            /**
-             * @default false
-             */
-            withSuffix?: boolean;
-            /**
-             * @default true
-             */
-            withSource?: boolean;
-        };
-    }
-}

package/dist/cli.d.ts

@@ -1,14 +0,0 @@
-declare module 'jiek' {
-    interface Config {
-        publish?: {
-            /**
-             * @default false
-             */
-            withSuffix?: boolean;
-            /**
-             * @default true
-             */
-            withSource?: boolean;
-        };
-    }
-}

package/src/cli-only-build.ts

@@ -1,11 +0,0 @@
-import './utils/filterSupport'
-import './commands/base'
-import './commands/build'
-
-import parseArgv from './parseArgv'
-
-import process from 'node:process'
-
-if (process.env.JIEK_IS_ONLY_BUILD === 'true') {
-  parseArgv()
-}

package/src/cli.ts

@@ -1,6 +0,0 @@
-import './commands/publish'
-import 'jiek/cli-only-build'
-
-import parseArgv from './parseArgv'
-
-parseArgv()