@hypequery/cli 0.0.1 → 0.0.2

package/dist/utils/load-api.js

@@ -1,14 +1,3 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -45,23 +34,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { pathToFileURL } from 'node:url';
-import { spawn } from 'node:child_process';
 import { access } from 'node:fs/promises';
 import path from 'node:path';
+import { ensureTypeScriptRuntime } from './ensure-ts-runtime.js';
+var TYPESCRIPT_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts']);
 export function loadApiModule(modulePath) {
     return __awaiter(this, void 0, void 0, function () {
-        var resolved, _a, relativePath, isTypeScript, _b, child, moduleUrl, mod, error_1, relativePath, api, relativePath, availableExports;
-        var _c;
+        var resolved, _a, relativePath, extension, isTypeScript, error_1, moduleUrl, mod, error_2, relativePath, api, relativePath, availableExports;
+        var _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -81,57 +62,41 @@ export function loadApiModule(modulePath) {
                         "You can specify a different file with:\n" +
                         "  hypequery dev path/to/your/queries.ts");
                 case 4:
-                    isTypeScript = resolved.endsWith('.ts') || resolved.endsWith('.mts') || resolved.endsWith('.cts');
-                    if (!(isTypeScript && !process.env.TSX_LOADED)) return [3 /*break*/, 9];
+                    extension = path.extname(resolved).toLowerCase();
+                    isTypeScript = TYPESCRIPT_EXTENSIONS.has(extension);
+                    if (!isTypeScript) return [3 /*break*/, 8];
                     _d.label = 5;
                 case 5:
                     _d.trys.push([5, 7, , 8]);
-                    // @ts-ignore - tsx module might not have types
-                    return [4 /*yield*/, import('tsx/esm')];
+                    return [4 /*yield*/, ensureTypeScriptRuntime()];
                 case 6:
-                    // @ts-ignore - tsx module might not have types
                     _d.sent();
                     return [3 /*break*/, 8];
                 case 7:
-                    _b = _d.sent();
-                    throw new Error("To run TypeScript files directly, install tsx:\n  npm install -D tsx\n\nOr compile your TypeScript first and use the .js file instead.");
+                    error_1 = _d.sent();
+                    throw new Error("Failed to load TypeScript support. This should never happen because the CLI bundles tsx.\n" +
+                        "Original error: ".concat((_b = error_1 === null || error_1 === void 0 ? void 0 : error_1.message) !== null && _b !== void 0 ? _b : error_1));
                 case 8:
-                    // Re-exec the current command with tsx
-                    console.error('\n⚠️  TypeScript detected. Restarting with tsx...\n');
-                    child = spawn('npx', __spreadArray(['tsx'], process.argv.slice(1), true), {
-                        stdio: 'inherit',
-                        env: __assign(__assign({}, process.env), { TSX_LOADED: 'true' }),
-                    });
-                    child.on('exit', function (code) {
-                        process.exit(code || 0);
-                    });
-                    child.on('error', function (error) {
-                        console.error('Failed to restart with tsx:', error);
-                        process.exit(1);
-                    });
-                    // Return a never-resolving promise since we're exiting
-                    return [2 /*return*/, new Promise(function () { })];
-                case 9:
                     moduleUrl = "".concat(pathToFileURL(resolved).href, "?t=").concat(Date.now());
-                    _d.label = 10;
-                case 10:
-                    _d.trys.push([10, 12, , 13]);
+                    _d.label = 9;
+                case 9:
+                    _d.trys.push([9, 11, , 12]);
                     return [4 /*yield*/, import(moduleUrl)];
-                case 11:
+                case 10:
                     mod = _d.sent();
-                    return [3 /*break*/, 13];
-                case 12:
-                    error_1 = _d.sent();
+                    return [3 /*break*/, 12];
+                case 11:
+                    error_2 = _d.sent();
                     relativePath = path.relative(process.cwd(), resolved);
                     throw new Error("Failed to load module: ".concat(relativePath, "\n\n") +
-                        "Error: ".concat(error_1.message, "\n\n") +
-                        (error_1.code === 'ERR_MODULE_NOT_FOUND'
+                        "Error: ".concat(error_2.message, "\n\n") +
+                        (error_2.code === 'ERR_MODULE_NOT_FOUND'
                             ? "This usually means:\n" +
                                 "  \u2022 A dependency is missing (run 'npm install')\n" +
                                 "  \u2022 An import path is incorrect\n"
                             : "") +
-                        (error_1.stack ? "\nStack trace:\n".concat(error_1.stack, "\n") : ''));
-                case 13:
+                        (error_2.stack ? "\nStack trace:\n".concat(error_2.stack, "\n") : ''));
+                case 12:
                     api = (_c = mod.api) !== null && _c !== void 0 ? _c : mod.default;
                     if (!api || typeof api.handler !== 'function') {
                         relativePath = path.relative(process.cwd(), resolved);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Command-line interface for Hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,30 +11,28 @@
     "dist"
   ],
   "dependencies": {
+    "@clickhouse/client": "^1.16.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
+    "dotenv": "^16.4.7",
     "open": "^10.0.0",
     "ora": "^8.0.1",
-    "prompts": "^2.4.2"
+    "prompts": "^2.4.2",
+    "tsx": "^4.19.2"
   },
   "peerDependencies": {
     "@hypequery/clickhouse": "*",
-    "@hypequery/serve": "*",
-    "tsx": "^4.0.0"
+    "@hypequery/serve": "*"
   },
   "peerDependenciesMeta": {
     "@hypequery/clickhouse": {
       "optional": true
-    },
-    "tsx": {
-      "optional": true
     }
   },
   "devDependencies": {
     "@types/node": "^20.11.30",
     "@types/prompts": "^2.4.9",
     "@vitest/coverage-v8": "^2.1.6",
-    "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "vitest": "^2.1.6",
     "@hypequery/clickhouse": "1.4.1",