jiek 2.2.1 → 2.2.3-alpha.1

package/dist/cli.cjs

@@ -47,8 +47,7 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefault(require$$0$1);
 
 let root;
 function getRoot() {
-  if (root)
-    return root;
+  if (root) return root;
   const rootOption = process.env.JIEK_ROOT;
   root = rootOption ? path__default.default.isAbsolute(rootOption) ? rootOption : path__default.default.resolve(process.cwd(), rootOption) : void 0;
   return root;
@@ -57,8 +56,7 @@ function getRoot() {
 let wd;
 let notWorkspace = false;
 function getWD() {
-  if (wd)
-    return { wd, notWorkspace };
+  if (wd) return { wd, notWorkspace };
   const root = getRoot();
   if (root !== void 0) {
     const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, type);
@@ -4313,14 +4311,24 @@ function getExports({
     }
   );
   const crossModuleWithConditional = crossModuleConvertor ? {
-    import: (opts) => !pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["import", "module"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".mjs") : false,
-    require: (opts) => pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["require", "node"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".cjs") : false
+    import: (opts) => {
+      if (pkgIsModule) return false;
+      if (opts.src.endsWith(".cts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["import", "module"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".mjs");
+    },
+    require: (opts) => {
+      if (!pkgIsModule) return false;
+      if (opts.src.endsWith(".mts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["require", "node"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".cjs");
+    }
   } : {};
   return [
     filteredResolvedEntrypoints,
@@ -4438,8 +4446,7 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module)
-    throw new Error("config file is empty");
+  if (!module) throw new Error("config file is empty");
   return module.default ?? module;
 }
 
@@ -4551,10 +4558,8 @@ async function prepublish({ bumper: bumper$1 } = {}) {
       )
     );
     for (const [key, value] of Object.entries(manifest)) {
-      if (key === "version")
-        continue;
-      if (JSON.stringify(value) === JSON.stringify(oldJSON[key]))
-        continue;
+      if (key === "version") continue;
+      if (JSON.stringify(value) === JSON.stringify(oldJSON[key])) continue;
       if (key !== "exports") {
         newJSONString = jsoncParser.applyEdits(
           newJSONString,
@@ -4593,8 +4598,7 @@ async function prepublish({ bumper: bumper$1 } = {}) {
             }
           }
           for (const [k, v] of Object.entries(indexPublishConfig)) {
-            if (v === void 0)
-              continue;
+            if (v === void 0) continue;
             newJSONString = jsoncParser.applyEdits(
               newJSONString,
               jsoncParser.modify(

package/dist/cli.js

@@ -16,8 +16,7 @@ import 'jiek/cli-only-build';
 
 let root;
 function getRoot() {
-  if (root)
-    return root;
+  if (root) return root;
   const rootOption = process.env.JIEK_ROOT;
   root = rootOption ? path.isAbsolute(rootOption) ? rootOption : path.resolve(process.cwd(), rootOption) : void 0;
   return root;
@@ -26,8 +25,7 @@ function getRoot() {
 let wd;
 let notWorkspace = false;
 function getWD() {
-  if (wd)
-    return { wd, notWorkspace };
+  if (wd) return { wd, notWorkspace };
   const root = getRoot();
   if (root !== void 0) {
     const isWorkspace = isWorkspaceDir(root, type);
@@ -4282,14 +4280,24 @@ function getExports({
     }
   );
   const crossModuleWithConditional = crossModuleConvertor ? {
-    import: (opts) => !pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["import", "module"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".mjs") : false,
-    require: (opts) => pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["require", "node"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".cjs") : false
+    import: (opts) => {
+      if (pkgIsModule) return false;
+      if (opts.src.endsWith(".cts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["import", "module"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".mjs");
+    },
+    require: (opts) => {
+      if (!pkgIsModule) return false;
+      if (opts.src.endsWith(".mts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["require", "node"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".cjs");
+    }
   } : {};
   return [
     filteredResolvedEntrypoints,
@@ -4407,8 +4415,7 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module)
-    throw new Error("config file is empty");
+  if (!module) throw new Error("config file is empty");
   return module.default ?? module;
 }
 
@@ -4520,10 +4527,8 @@ async function prepublish({ bumper } = {}) {
       )
     );
     for (const [key, value] of Object.entries(manifest)) {
-      if (key === "version")
-        continue;
-      if (JSON.stringify(value) === JSON.stringify(oldJSON[key]))
-        continue;
+      if (key === "version") continue;
+      if (JSON.stringify(value) === JSON.stringify(oldJSON[key])) continue;
       if (key !== "exports") {
         newJSONString = applyEdits(
           newJSONString,
@@ -4562,8 +4567,7 @@ async function prepublish({ bumper } = {}) {
             }
           }
           for (const [k, v] of Object.entries(indexPublishConfig)) {
-            if (v === void 0)
-              continue;
+            if (v === void 0) continue;
             newJSONString = applyEdits(
               newJSONString,
               modify(

package/dist/index.d.cts

@@ -40,6 +40,17 @@ interface TemplateOptions {
     } & rollup_plugin_esbuild.Options) | ({
         type: 'swc';
     } & rollup_plugin_swc3.PluginOptions);
+    features?: {
+        /**
+         * 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.
+         *
+         * @default true
+         */
+        keepImportAttributes?: boolean | 'assert';
+    };
     output?: {
         /**
          * @default true

package/dist/index.d.ts

@@ -40,6 +40,17 @@ interface TemplateOptions {
     } & rollup_plugin_esbuild.Options) | ({
         type: 'swc';
     } & rollup_plugin_swc3.PluginOptions);
+    features?: {
+        /**
+         * 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.
+         *
+         * @default true
+         */
+        keepImportAttributes?: boolean | 'assert';
+    };
     output?: {
         /**
          * @default true

package/dist/rollup/index.cjs

@@ -4171,8 +4171,7 @@ function bundleAnalyzer(modulesResolved) {
       return {
         name: "jiek:bundle-analyzer",
         async closeBundle(...args) {
-          if (typeof ana.closeBundle !== "function")
-            return;
+          if (typeof ana.closeBundle !== "function") return;
           return ana.closeBundle?.call(this, ...args);
         }
       };
@@ -4254,14 +4253,24 @@ function getExports({
     }
   );
   const crossModuleWithConditional = crossModuleConvertor ? {
-    import: (opts) => !pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["import", "module"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".mjs") : false,
-    require: (opts) => pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["require", "node"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".cjs") : false
+    import: (opts) => {
+      if (pkgIsModule) return false;
+      if (opts.src.endsWith(".cts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["import", "module"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".mjs");
+    },
+    require: (opts) => {
+      if (!pkgIsModule) return false;
+      if (opts.src.endsWith(".mts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["require", "node"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".cjs");
+    }
   } : {};
   return [
     filteredResolvedEntrypoints,
@@ -4280,8 +4289,7 @@ function getExports({
 
 let root;
 function getRoot() {
-  if (root)
-    return root;
+  if (root) return root;
   const rootOption = process.env.JIEK_ROOT;
   root = rootOption ? path__default.default.isAbsolute(rootOption) ? rootOption : path__default.default.resolve(process.cwd(), rootOption) : void 0;
   return root;
@@ -4298,8 +4306,7 @@ try {
 let wd;
 let notWorkspace = false;
 function getWD() {
-  if (wd)
-    return { wd, notWorkspace };
+  if (wd) return { wd, notWorkspace };
   const root = getRoot();
   if (root !== void 0) {
     const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, type);
@@ -4421,16 +4428,14 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module)
-    throw new Error("config file is empty");
+  if (!module) throw new Error("config file is empty");
   return module.default ?? module;
 }
 
 const recusiveListFiles = (dir) => fs__default.default.readdirSync(dir).reduce((acc, file) => {
   const filePath = path.resolve(dir, file);
   if (fs__default.default.statSync(filePath).isDirectory()) {
-    if (filePath.endsWith("/node_modules"))
-      return acc;
+    if (filePath.endsWith("/node_modules")) return acc;
     return [...acc, ...recusiveListFiles(filePath)];
   }
   return [...acc, filePath];
@@ -4443,10 +4448,9 @@ const getExtendTSConfig = (tsconfigPath) => {
   const { extends: exts, ...tsconfig } = getTSConfig(tsconfigPath);
   const resolvePaths = (paths) => paths?.map((p) => path.resolve(tsconfigPathDirname, p)) ?? [];
   const extendsPaths = resolvePaths(
-    exts ? Array.isArray(exts) ? exts : [exts] : []
+    exts !== void 0 ? Array.isArray(exts) ? exts : [exts] : []
   );
-  if (extendsPaths.length === 0)
-    return tsconfig;
+  if (extendsPaths.length === 0) return tsconfig;
   return extendsPaths.map(getExtendTSConfig).concat(tsconfig).reduce((acc, { compilerOptions = {}, references: _, ...curr }) => ({
     ...acc,
     ...curr,
@@ -4473,24 +4477,20 @@ const getCompilerOptionsByFilePath = (tsconfigPath, filePath) => {
     tsconfig.include,
     tsconfig.exclude
   ].map(resolvePaths);
-  if (exclude.length > 0 && exclude.some((i) => micromatchExports.isMatch(filePath, i)))
-    return;
-  if (tsconfig.files?.length === 0 && tsconfig.include?.length === 0)
-    return;
+  if (exclude.length > 0 && exclude.some((i) => micromatchExports.isMatch(filePath, i))) return;
+  if (tsconfig.files?.length === 0 && tsconfig.include?.length === 0) return;
   let isInclude = false;
   isInclude || (isInclude = files.length > 0 && files.includes(filePath));
   isInclude || (isInclude = include.length > 0 && include.some((i) => micromatchExports.isMatch(filePath, i)));
   if (isInclude) {
     return tsconfig.compilerOptions ?? {};
   } else {
-    if (tsconfig.files && tsconfig.files.length > 0 || tsconfig.include && tsconfig.include.length > 0)
-      return;
+    if (tsconfig.files && tsconfig.files.length > 0 || tsconfig.include && tsconfig.include.length > 0) return;
   }
   references.reverse();
   for (const ref of references) {
     const compilerOptions = getCompilerOptionsByFilePath(ref, filePath);
-    if (compilerOptions)
-      return compilerOptions;
+    if (compilerOptions) return compilerOptions;
   }
   return tsconfig.compilerOptions;
 };
@@ -4669,10 +4669,8 @@ const resolveOutputControls = (context, output) => ({
 const resolveWorkspacePath = (p) => path.resolve(WORKSPACE_ROOT, p);
 const pascalCase = (str) => str.replace(/[@|/-](\w)/g, (_, $1) => $1.toUpperCase()).replace(/(?:^|-)(\w)/g, (_, $1) => $1.toUpperCase());
 const reveal = (obj, keys) => keys.reduce((acc, key) => {
-  if (typeof acc === "string")
-    throw new Error("key not found in exports");
-  if (!(key in acc))
-    throw new Error(`key ${key} not found in exports`);
+  if (typeof acc === "string") throw new Error("key not found in exports");
+  if (!(key in acc)) throw new Error(`key ${key} not found in exports`);
   return acc[key];
 }, obj);
 const resolveMinifyOptions = (minifyOptions) => typeof minifyOptions === "string" ? { type: minifyOptions } : minifyOptions ?? { type: "esbuild" };
@@ -4692,7 +4690,7 @@ const withMinify = (output, onlyOncePlugins = []) => {
   const minifyPlugin = resolvedMinifyOptions.type === "esbuild" ? import('rollup-plugin-esbuild').then(({ minify: minify2 }) => minify2(noTypeResolvedMinifyOptions)) : resolvedMinifyOptions.type === "swc" ? import('rollup-plugin-swc3').then(({ minify: minify2 }) => minify2(noTypeResolvedMinifyOptions)) : import('@rollup/plugin-terser').then(({ default: minify2 }) => minify2(noTypeResolvedMinifyOptions));
   return minify === "only-minify" ? [{
     ...output,
-    // TODO replace suffix when pubish to npm and the `build.output.minify` is 'only-minify'
+    // TODO replace suffix when publish to npm and the `build.output.minify` is 'only-minify'
     // TODO resolve dts output file name
     entryFileNames: (chunkInfo) => typeof output.entryFileNames === "function" ? output.entryFileNames(chunkInfo) : (() => {
       throw new Error("entryFileNames must be a function");
@@ -4799,15 +4797,48 @@ const generateConfigs = (context, options = {}) => {
   const { js: jsOutput, dts: dtsOutput } = resolveOutputControls(context, build.output);
   const rollupOptions = [];
   const commonPlugins = [
-    pluginNodeResolve.nodeResolve({ exportConditions })
+    pluginNodeResolve.nodeResolve({
+      exportConditions,
+      extensions: [
+        ".js",
+        ".cjs",
+        ".mjs",
+        ".jsx",
+        ".cjsx",
+        ".mjsx",
+        ".ts",
+        ".cts",
+        ".mts",
+        ".tsx",
+        ".ctsx",
+        ".mtsx"
+      ]
+    })
   ];
   if (jsOutput && !WITHOUT_JS) {
     const sourcemap = typeof options?.output?.sourcemap === "object" ? options.output.sourcemap.js : options?.output?.sourcemap;
+    const features = Object.assign({
+      keepImportAttributes: true
+    }, build.features);
     const builder = resolvedBuilderOptions.type === "esbuild" ? import('rollup-plugin-esbuild').then(
       ({ default: esbuild }) => esbuild({
         sourceMap: sourcemap === "hidden" ? false : !!sourcemap,
         tsconfig: buildTSConfigPath,
-        ...noTypeResolvedBuilderOptions
+        loaders: {
+          cts: "ts",
+          ctsx: "tsx",
+          mts: "ts",
+          mtsx: "tsx",
+          cjs: "js",
+          cjsx: "jsx",
+          mjs: "js",
+          mjsx: "jsx"
+        },
+        ...noTypeResolvedBuilderOptions,
+        supported: {
+          "import-attributes": features.keepImportAttributes !== false,
+          ...resolvedBuilderOptions.supported
+        }
       })
     ) : import('rollup-plugin-swc3').then(
       ({ default: swc }) => swc({
@@ -4816,7 +4847,14 @@ const generateConfigs = (context, options = {}) => {
           inline: "inline"
         }[sourcemap] ?? void 0,
         tsconfig: buildTSConfigPath,
-        ...noTypeResolvedBuilderOptions
+        ...noTypeResolvedBuilderOptions,
+        jsc: {
+          ...resolvedBuilderOptions.jsc,
+          experimental: {
+            ...resolvedBuilderOptions.jsc?.experimental,
+            keepImportAttributes: features.keepImportAttributes !== false
+          }
+        }
       })
     );
     const [ana, anaOutputPlugin] = bundleAnalyzer((modules) => void publishInEntry("modulesAnalyze", { modules }));
@@ -4835,6 +4873,8 @@ const generateConfigs = (context, options = {}) => {
           sourcemap,
           format,
           strict: typeof options?.output?.strict === "object" ? options.output.strict.js : options?.output?.strict,
+          externalImportAttributes: features.keepImportAttributes !== false,
+          importAttributesKey: features.keepImportAttributes === false || features.keepImportAttributes === void 0 ? void 0 : features.keepImportAttributes === true ? "with" : features.keepImportAttributes,
           plugins: [
             isFormatEsm(format === "esm")
           ]
@@ -4910,10 +4950,8 @@ const generateConfigs = (context, options = {}) => {
 function template(packageJSON) {
   const { name, type, exports: entrypoints$1 } = packageJSON;
   const pkgIsModule = type === "module";
-  if (!name)
-    throw new Error("package.json name is required");
-  if (!entrypoints$1)
-    throw new Error("package.json exports is required");
+  if (!name) throw new Error("package.json name is required");
+  if (!entrypoints$1) throw new Error("package.json exports is required");
   const packageName = pascalCase(name);
   const external = externalResolver(packageJSON);
   const [filteredResolvedEntrypoints, exports] = getExports({
@@ -4933,6 +4971,7 @@ function template(packageJSON) {
     }
     return false;
   });
+  console.log(exports);
   const configs = [];
   leafMap.forEach(
     (keysArr, input) => keysArr.forEach((keys) => {