@0x-jerry/x 2.9.2 → 2.10.0

package/dist/{chunk-UW6XLRG7.js → chunk-ELIYGHQS.js}

@@ -1,9 +1,9 @@
 // src/utils.ts
 import { existsSync } from "fs";
 import { exec as _exec } from "@0x-jerry/utils/node";
-async function exec(script, params, env) {
+async function exec(script, params, opt) {
   const cmd = [script, ...params].join(" ");
-  await _exec(cmd, { env });
+  await _exec(cmd, opt);
 }
 function exists(path) {
   return existsSync(path);

package/dist/{chunk-TEO3M6Z2.js → chunk-VDPUNX7B.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.9.2";
+var version = "2.10.0";
 
 export {
   version

package/dist/hooks/index.js

@@ -1,17 +1,7 @@
-import {
-  __export
-} from "../chunk-MLKGABMK.js";
-
 // src/hooks/index.ts
 import * as tsx from "tsx/esm";
 
 // src/hooks/jsonc.ts
-var jsonc_exports = {};
-__export(jsonc_exports, {
-  load: () => load,
-  resolve: () => resolve
-});
-import path from "path";
 import stripJsonComment from "strip-json-comments";
 
 // src/hooks/utils.ts
@@ -37,90 +27,79 @@ function chainHooks(fns) {
   return wrapperFn;
 }
 
-// src/hooks/jsonc.ts
-var supportedExtensions = [".jsonc"];
-var FORMAT_TYPE = "jsonc";
-var resolve = async (specifier, ctx, nextResolve) => {
-  const nextResult = await nextResolve(specifier, ctx);
-  const ext = path.extname(specifier);
-  if (!supportedExtensions.includes(ext)) return nextResult;
-  return {
-    ...nextResult,
-    format: FORMAT_TYPE
+// src/hooks/helper.ts
+function createModuleHook({
+  type,
+  loader
+}) {
+  const resolve2 = async (specifier, ctx, nextResolve) => {
+    const nextResult = await nextResolve(specifier, ctx);
+    if (ctx.importAttributes.type !== type) {
+      return nextResult;
+    }
+    return {
+      ...nextResult,
+      format: type,
+      shortCircuit: true
+    };
+  };
+  const load2 = async (url, ctx, nextLoad) => {
+    const nextResult = await nextLoad(url, ctx);
+    if (ctx.format !== type) return nextResult;
+    const source = await loader(sourceToStr(nextResult.source));
+    return {
+      shortCircuit: true,
+      ...source
+    };
   };
-};
-var load = async (url, ctx, nextLoad) => {
-  const nextResult = await nextLoad(url, ctx);
-  if (ctx.format !== FORMAT_TYPE) return nextResult;
-  const source = stripJsonComment(sourceToStr(nextResult.source));
   return {
-    format: "json",
-    source
+    resolve: resolve2,
+    load: load2
   };
-};
+}
+
+// src/hooks/jsonc.ts
+var jsonc_default = createModuleHook({
+  type: "jsonc",
+  loader(rawSource) {
+    const source = stripJsonComment(rawSource);
+    return {
+      format: "json",
+      source
+    };
+  }
+});
 
 // src/hooks/text.ts
-var text_exports = {};
-__export(text_exports, {
-  load: () => load2,
-  resolve: () => resolve2
+var text_default = createModuleHook({
+  type: "text",
+  loader(rawSource) {
+    const source = `export default ${JSON.stringify(rawSource)};`;
+    return {
+      format: "module",
+      source
+    };
+  }
 });
-import path2 from "path";
-var supportedExtensions2 = [".txt", ".sql", ".md"];
-var FORMAT_TYPE2 = "text";
-var resolve2 = async (specifier, ctx, nextResolve) => {
-  const nextResult = await nextResolve(specifier, ctx);
-  const ext = path2.extname(specifier);
-  if (!supportedExtensions2.includes(ext)) return nextResult;
-  return {
-    ...nextResult,
-    format: FORMAT_TYPE2
-  };
-};
-var load2 = async (url, ctx, nextLoad) => {
-  const nextResult = await nextLoad(url, ctx);
-  if (ctx.format !== FORMAT_TYPE2) return nextResult;
-  const source = `export default ${JSON.stringify(sourceToStr(nextResult.source))};`;
-  return {
-    format: "module",
-    source
-  };
-};
 
 // src/hooks/yaml.ts
-var yaml_exports = {};
-__export(yaml_exports, {
-  load: () => load3,
-  resolve: () => resolve3
-});
-import path3 from "path";
 import yaml from "yaml";
-var supportedExtensions3 = [".yaml", ".yml"];
-var FORMAT_TYPE3 = "yaml";
-var resolve3 = async (specifier, ctx, nextResolve) => {
-  const nextResult = await nextResolve(specifier, ctx);
-  const ext = path3.extname(specifier);
-  if (!supportedExtensions3.includes(ext)) return nextResult;
-  return {
-    ...nextResult,
-    format: FORMAT_TYPE3
-  };
-};
-var load3 = async (url, ctx, nextLoad) => {
-  if (ctx.format !== FORMAT_TYPE3) return nextLoad(url, ctx);
-  const nextResult = await nextLoad(url, ctx);
-  const source = yaml.parse(sourceToStr(nextResult.source));
-  return {
-    format: "json",
-    source: JSON.stringify(source)
-  };
-};
+var yaml_default = createModuleHook({
+  type: "yaml",
+  loader(rawSource) {
+    const source = yaml.parse(rawSource);
+    return {
+      format: "json",
+      source: JSON.stringify(source)
+    };
+  }
+});
 
 // src/hooks/index.ts
-var hooks = [jsonc_exports, text_exports, yaml_exports, tsx];
-var resolve4 = chainHooks(hooks.map((n) => n.resolve));
-var load4 = chainHooks(hooks.map((n) => n.load));
+var hooks = [jsonc_default, text_default, yaml_default, tsx];
+var resolve = chainHooks(hooks.map((n) => n.resolve));
+var load = chainHooks(hooks.map((n) => n.load));
 export {
-  load4 as load,
-  resolve4 as resolve
+  load,
+  resolve
 };

package/dist/x.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 import {
   version
-} from "./chunk-TEO3M6Z2.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-VDPUNX7B.js";
 
 // src/x.ts
 import { sliver } from "@0x-jerry/silver";

package/dist/xn.js

@@ -3,11 +3,10 @@ import {
   exec,
   exists,
   flagOptionToStringArray
-} from "./chunk-UW6XLRG7.js";
+} from "./chunk-ELIYGHQS.js";
 import {
   version
-} from "./chunk-TEO3M6Z2.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-VDPUNX7B.js";
 
 // src/xn.ts
 import { sliver } from "@0x-jerry/silver";

package/dist/xr.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 import {
   exec
-} from "./chunk-UW6XLRG7.js";
+} from "./chunk-ELIYGHQS.js";
 import {
   version
-} from "./chunk-TEO3M6Z2.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-VDPUNX7B.js";
 
 // src/xr.ts
 import { sliver } from "@0x-jerry/silver";
@@ -111,7 +110,7 @@ async function runScript(command, params = []) {
       const task = await taskDetector.task(cwd, command);
       if (task) {
         const env = makeEnv(await taskDetector.binaryPaths?.(cwd) || []);
-        await exec(task, params, env);
+        await exec(task, params, { env });
         return;
       }
     }
@@ -156,17 +155,17 @@ ins.type("command", async () => {
 });
 async function defaultAction(_, arg) {
   const [commandOrFile, ...params] = arg._;
-  if (isJsFile(commandOrFile)) {
-    await exec("node", [
-      "--import",
-      import.meta.resolve(`./hooks/register.js`),
-      commandOrFile
-    ]);
-    return;
-  }
   try {
-    await runScript(commandOrFile, params);
-  } catch (error) {
+    if (isJsFile(commandOrFile)) {
+      await exec(
+        "node",
+        ["--import", import.meta.resolve(`./hooks/register.js`), commandOrFile],
+        { silent: true }
+      );
+    } else {
+      await runScript(commandOrFile, params);
+    }
+  } catch (_error) {
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0x-jerry/x",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/0x-jerry/x.git"

package/dist/chunk-MLKGABMK.js

@@ -1,9 +0,0 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-export {
-  __export
-};