@hypequery/cli 0.0.2 → 0.0.4

package/dist/cli.js

@@ -155,7 +155,7 @@ program.on('--help', function () {
     console.log('  hypequery init');
     console.log('  hypequery dev');
     console.log('  hypequery dev --port 3000');
-    console.log('  hypequery generate --watch');
+    console.log('  hypequery generate --output analytics/schema.ts');
     console.log('');
     console.log('Docs: https://hypequery.com/docs');
 });

package/dist/utils/load-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-api.d.ts","sourceRoot":"","sources":["../../src/utils/load-api.ts"],"names":[],"mappings":"AAOA,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,gBAgFrD"}
+{"version":3,"file":"load-api.d.ts","sourceRoot":"","sources":["../../src/utils/load-api.ts"],"names":[],"mappings":"AAQA,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,gBAuErD"}

package/dist/utils/load-api.js

@@ -37,12 +37,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { pathToFileURL } from 'node:url';
 import { access } from 'node:fs/promises';
 import path from 'node:path';
-import { ensureTypeScriptRuntime } from './ensure-ts-runtime.js';
+import { build } from 'esbuild';
 var TYPESCRIPT_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts']);
+var tsconfigCache = new Map();
 export function loadApiModule(modulePath) {
     return __awaiter(this, void 0, void 0, function () {
-        var resolved, _a, relativePath, extension, isTypeScript, error_1, moduleUrl, mod, error_2, relativePath, api, relativePath, availableExports;
-        var _b, _c;
+        var resolved, _a, relativePath, extension, isTypeScript, moduleUrl, _b, mod, error_1, relativePath, api, relativePath, availableExports;
+        var _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -64,39 +65,35 @@ export function loadApiModule(modulePath) {
                 case 4:
                     extension = path.extname(resolved).toLowerCase();
                     isTypeScript = TYPESCRIPT_EXTENSIONS.has(extension);
-                    if (!isTypeScript) return [3 /*break*/, 8];
-                    _d.label = 5;
+                    if (!isTypeScript) return [3 /*break*/, 6];
+                    return [4 /*yield*/, bundleTypeScriptModule(resolved)];
                 case 5:
-                    _d.trys.push([5, 7, , 8]);
-                    return [4 /*yield*/, ensureTypeScriptRuntime()];
+                    _b = _d.sent();
+                    return [3 /*break*/, 7];
                 case 6:
-                    _d.sent();
-                    return [3 /*break*/, 8];
+                    _b = "".concat(pathToFileURL(resolved).href, "?t=").concat(Date.now());
+                    _d.label = 7;
                 case 7:
-                    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));
+                    moduleUrl = _b;
+                    _d.label = 8;
                 case 8:
-                    moduleUrl = "".concat(pathToFileURL(resolved).href, "?t=").concat(Date.now());
-                    _d.label = 9;
-                case 9:
-                    _d.trys.push([9, 11, , 12]);
+                    _d.trys.push([8, 10, , 11]);
                     return [4 /*yield*/, import(moduleUrl)];
-                case 10:
+                case 9:
                     mod = _d.sent();
-                    return [3 /*break*/, 12];
-                case 11:
-                    error_2 = _d.sent();
+                    return [3 /*break*/, 11];
+                case 10:
+                    error_1 = _d.sent();
                     relativePath = path.relative(process.cwd(), resolved);
                     throw new Error("Failed to load module: ".concat(relativePath, "\n\n") +
-                        "Error: ".concat(error_2.message, "\n\n") +
-                        (error_2.code === 'ERR_MODULE_NOT_FOUND'
+                        "Error: ".concat(error_1.message, "\n\n") +
+                        (error_1.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_2.stack ? "\nStack trace:\n".concat(error_2.stack, "\n") : ''));
-                case 12:
+                        (error_1.stack ? "\nStack trace:\n".concat(error_1.stack, "\n") : ''));
+                case 11:
                     api = (_c = mod.api) !== null && _c !== void 0 ? _c : mod.default;
                     if (!api || typeof api.handler !== 'function') {
                         relativePath = path.relative(process.cwd(), resolved);
@@ -126,3 +123,111 @@ export function loadApiModule(modulePath) {
         });
     });
 }
+function bundleTypeScriptModule(entryPath) {
+    return __awaiter(this, void 0, void 0, function () {
+        var relativePath, tsconfigPath, result, output, contents, base64, error_2;
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    relativePath = path.relative(process.cwd(), entryPath);
+                    return [4 /*yield*/, findNearestTsconfig(entryPath)];
+                case 1:
+                    tsconfigPath = _e.sent();
+                    _e.label = 2;
+                case 2:
+                    _e.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, build({
+                            entryPoints: [entryPath],
+                            bundle: true,
+                            format: 'esm',
+                            platform: 'node',
+                            target: ['node18'],
+                            sourcemap: 'inline',
+                            write: false,
+                            logLevel: 'silent',
+                            absWorkingDir: process.cwd(),
+                            packages: 'external',
+                            tsconfig: tsconfigPath !== null && tsconfigPath !== void 0 ? tsconfigPath : undefined,
+                            loader: {
+                                '.ts': 'ts',
+                                '.tsx': 'tsx',
+                                '.mts': 'ts',
+                                '.cts': 'ts',
+                            },
+                        })];
+                case 3:
+                    result = _e.sent();
+                    output = (_b = (_a = result.outputFiles) === null || _a === void 0 ? void 0 : _a.find(function (file) { return file.path.endsWith('.js'); })) !== null && _b !== void 0 ? _b : (_c = result.outputFiles) === null || _c === void 0 ? void 0 : _c[0];
+                    if (!output) {
+                        throw new Error('esbuild produced no output');
+                    }
+                    contents = "".concat(output.text, "\n//# sourceURL=").concat(pathToFileURL(entryPath).href);
+                    base64 = Buffer.from(contents, 'utf8').toString('base64');
+                    return [2 /*return*/, "data:text/javascript;base64,".concat(base64, "#ts=").concat(Date.now())];
+                case 4:
+                    error_2 = _e.sent();
+                    throw new Error("Failed to compile ".concat(relativePath, " with esbuild.\n") +
+                        "Original error: ".concat((_d = error_2 === null || error_2 === void 0 ? void 0 : error_2.message) !== null && _d !== void 0 ? _d : error_2));
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
+function findNearestTsconfig(filePath) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dir, visited, _loop_1, state_1;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    dir = path.dirname(filePath);
+                    visited = [];
+                    _loop_1 = function () {
+                        var cached_1, candidate, _c, parent_1;
+                        return __generator(this, function (_d) {
+                            switch (_d.label) {
+                                case 0:
+                                    if (tsconfigCache.has(dir)) {
+                                        cached_1 = (_a = tsconfigCache.get(dir)) !== null && _a !== void 0 ? _a : null;
+                                        visited.forEach(function (pathname) { return tsconfigCache.set(pathname, cached_1); });
+                                        return [2 /*return*/, { value: cached_1 }];
+                                    }
+                                    visited.push(dir);
+                                    candidate = path.join(dir, 'tsconfig.json');
+                                    _d.label = 1;
+                                case 1:
+                                    _d.trys.push([1, 3, , 4]);
+                                    return [4 /*yield*/, access(candidate)];
+                                case 2:
+                                    _d.sent();
+                                    tsconfigCache.set(dir, candidate);
+                                    visited.forEach(function (pathname) { return tsconfigCache.set(pathname, candidate); });
+                                    return [2 /*return*/, { value: candidate }];
+                                case 3:
+                                    _c = _d.sent();
+                                    parent_1 = path.dirname(dir);
+                                    if (parent_1 === dir) {
+                                        visited.forEach(function (pathname) { return tsconfigCache.set(pathname, null); });
+                                        return [2 /*return*/, { value: null }];
+                                    }
+                                    dir = parent_1;
+                                    return [3 /*break*/, 4];
+                                case 4: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    _b.label = 1;
+                case 1:
+                    if (!true) return [3 /*break*/, 3];
+                    return [5 /*yield**/, _loop_1()];
+                case 2:
+                    state_1 = _b.sent();
+                    if (typeof state_1 === "object")
+                        return [2 /*return*/, state_1.value];
+                    return [3 /*break*/, 1];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Command-line interface for Hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -15,10 +15,10 @@
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "dotenv": "^16.4.7",
+    "esbuild": "^0.24.0",
     "open": "^10.0.0",
     "ora": "^8.0.1",
-    "prompts": "^2.4.2",
-    "tsx": "^4.19.2"
+    "prompts": "^2.4.2"
   },
   "peerDependencies": {
     "@hypequery/clickhouse": "*",
@@ -35,8 +35,8 @@
     "@vitest/coverage-v8": "^2.1.6",
     "typescript": "^5.7.3",
     "vitest": "^2.1.6",
-    "@hypequery/clickhouse": "1.4.1",
-    "@hypequery/serve": "0.0.1"
+    "@hypequery/serve": "0.0.3",
+    "@hypequery/clickhouse": "1.5.0"
   },
   "publishConfig": {
     "access": "public"