jiek 2.2.6 → 2.2.7-alpha.1

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}

@@ -12,7 +12,7 @@ import {
 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,7 +58,20 @@ export function getOutDirs({
   }
 }
 
-export function getExports({
+export interface ResolveExportsOptions {
+  entrypoints: string | string[] | Record<string, unknown>
+  pkgName: string
+  pkgIsModule: boolean
+  entries?: string[]
+  config?: Config
+  dir?: string
+  outdir?: string
+  defaultOutdir?: string
+  noFilter?: boolean
+  isPublish?: boolean
+}
+
+export function resolveExports({
   entrypoints,
   pkgName,
   pkgIsModule,
@@ -70,18 +83,7 @@ export function getExports({
   outdir = getOutDirs({ pkgName, defaultOutdir, config, cwd: dir }).js,
   noFilter,
   isPublish
-}: {
-  entrypoints: string | string[] | Record<string, unknown>
-  pkgName: string
-  pkgIsModule: boolean
-  entries?: string[]
-  config?: Config
-  dir?: string
-  outdir?: string
-  defaultOutdir?: string
-  noFilter?: boolean
-  isPublish?: boolean
-}) {
+}: ResolveExportsOptions) {
   const {
     build = {},
     publish: {

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/bin-helper.cjs

@@ -1,43 +0,0 @@
-const process = require('node:process')
-
-/**
- * @type {string | undefined}
- */
-let binFilePath
-
-try {
-  // eslint-disable-next-line unicorn/error-message
-  throw new Error()
-} catch (e) {
-  const { stack } = e
-  const lines = stack.split('\n')
-  for (const line of lines) {
-    if (
-      line === 'Error' || line.includes(' (node:') || line.includes(` (${__filename}`)
-    ) {
-      continue
-    }
-    const match = line.match(/\(([^)]+)\)$/)
-    if (match) {
-      binFilePath = match[1].replace(/:\d+:\d+$/, '')
-    }
-    break
-  }
-}
-
-binFilePath = binFilePath ?? process.env.JIEK_BIN__FILEPATH
-
-const {
-  basename,
-  dirname
-} = require('node:path')
-
-const packageDir = dirname(dirname(binFilePath))
-const binFilename = basename(binFilePath).replace(/(\.[cm]?)js$/, '$1ts')
-
-process.env.JIEK_PACKAGE_DIR = packageDir
-process.env.JIEK_BIN__FILENAME = binFilename
-process.env.JIEK_BIN__FILEPATH = binFilePath
-
-require('esbuild-register')
-require(`${packageDir}/src/bin/${binFilename}`)

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