@risingwave/wavelet-cli 0.1.1 → 0.1.3

package/dist/config-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAe3E"}
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAY3E"}

package/dist/config-loader.js

@@ -1,13 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfig = loadConfig;
-const node_url_1 = require("node:url");
 const node_path_1 = require("node:path");
+const node_child_process_1 = require("node:child_process");
 async function loadConfig(configPath) {
     const abs = (0, node_path_1.resolve)(configPath);
-    const mod = await import((0, node_url_1.pathToFileURL)(abs).href);
-    const config = mod.default ?? mod;
-    if (!config.database) {
+    // For .ts files, use tsx to evaluate the config
+    if (abs.endsWith('.ts')) {
+        return loadTsConfig(abs);
+    }
+    // For .js/.mjs files, use dynamic import directly
+    const { pathToFileURL } = await import('node:url');
+    const mod = await import(pathToFileURL(abs).href);
+    return unwrapConfig(mod);
+}
+function loadTsConfig(absPath) {
+    // Use tsx to evaluate the TypeScript config and extract the result as JSON
+    const script = `
+    import('${absPath}').then(mod => {
+      let config = mod.default ?? mod;
+      if (config && typeof config === 'object' && 'default' in config) config = config.default;
+      process.stdout.write(JSON.stringify(config));
+    }).catch(err => {
+      process.stderr.write(err.message);
+      process.exit(1);
+    });
+  `;
+    try {
+        const result = (0, node_child_process_1.execSync)(`npx tsx -e "${script.replace(/"/g, '\\"')}"`, {
+            cwd: (0, node_path_1.resolve)(absPath, '..'),
+            encoding: 'utf-8',
+            timeout: 15000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        const config = JSON.parse(result);
+        if (!config || !config.database) {
+            throw new Error('Config missing database field');
+        }
+        return config;
+    }
+    catch (err) {
+        throw new Error(`Failed to load ${absPath}.\n` +
+            `Make sure tsx is installed: npm install tsx\n` +
+            `Error: ${err.stderr || err.message}`);
+    }
+}
+function unwrapConfig(mod) {
+    let config = mod.default ?? mod;
+    if (config && typeof config === 'object' && 'default' in config) {
+        config = config.default;
+    }
+    if (!config || !config.database) {
         throw new Error(`wavelet.config.ts must export a config with a 'database' field.\n` +
             `Example:\n` +
             `  import { defineConfig } from '@risingwave/wavelet'\n` +

package/dist/config-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":";;AAIA,gCAeC;AAnBD,uCAAwC;AACxC,yCAAmC;AAG5B,KAAK,UAAU,UAAU,CAAC,UAAkB;IACjD,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC,UAAU,CAAC,CAAA;IAC/B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAA,wBAAa,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;IACjD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAA;IAEjC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,mEAAmE;YACnE,YAAY;YACZ,wDAAwD;YACxD,+DAA+D,CAChE,CAAA;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":";;AAIA,gCAYC;AAhBD,yCAAmC;AACnC,2DAA6C;AAGtC,KAAK,UAAU,UAAU,CAAC,UAAkB;IACjD,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC,UAAU,CAAC,CAAA;IAE/B,gDAAgD;IAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAED,kDAAkD;IAClD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;IAClD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;IACjD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,2EAA2E;IAC3E,MAAM,MAAM,GAAG;cACH,OAAO;;;;;;;;GAQlB,CAAA;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,6BAAQ,EAAC,eAAe,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE;YACrE,GAAG,EAAE,IAAA,mBAAO,EAAC,OAAO,EAAE,IAAI,CAAC;YAC3B,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACjC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,kBAAkB,OAAO,KAAK;YAC9B,+CAA+C;YAC/C,UAAU,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,CACtC,CAAA;IACH,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ;IAC5B,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAA;IAC/B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;QAChE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAA;IACzB,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,mEAAmE;YACnE,YAAY;YACZ,wDAAwD;YACxD,+DAA+D,CAChE,CAAA;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@risingwave/wavelet-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Wavelet CLI - manage views, generate types, run dev server",
   "bin": {
     "wavelet": "./dist/index.js"
@@ -10,12 +10,12 @@
     "dev": "tsx src/index.ts"
   },
   "dependencies": {
-    "@risingwave/wavelet": "0.1.1",
-    "@risingwave/wavelet-server": "0.1.1",
-    "pg": "^8.13.0"
+    "@risingwave/wavelet": "0.1.3",
+    "@risingwave/wavelet-server": "0.1.3",
+    "pg": "^8.13.0",
+    "tsx": "^4.0.0"
   },
   "devDependencies": {
-    "tsx": "^4.0.0",
     "typescript": "^5.7.0",
     "@types/pg": "^8.11.0"
   },

package/src/config-loader.ts

@@ -1,13 +1,62 @@
-import { pathToFileURL } from 'node:url'
 import { resolve } from 'node:path'
+import { execSync } from 'node:child_process'
 import type { WaveletConfig } from '@risingwave/wavelet'
 
 export async function loadConfig(configPath: string): Promise<WaveletConfig> {
   const abs = resolve(configPath)
+
+  // For .ts files, use tsx to evaluate the config
+  if (abs.endsWith('.ts')) {
+    return loadTsConfig(abs)
+  }
+
+  // For .js/.mjs files, use dynamic import directly
+  const { pathToFileURL } = await import('node:url')
   const mod = await import(pathToFileURL(abs).href)
-  const config = mod.default ?? mod
+  return unwrapConfig(mod)
+}
+
+function loadTsConfig(absPath: string): WaveletConfig {
+  // Use tsx to evaluate the TypeScript config and extract the result as JSON
+  const script = `
+    import('${absPath}').then(mod => {
+      let config = mod.default ?? mod;
+      if (config && typeof config === 'object' && 'default' in config) config = config.default;
+      process.stdout.write(JSON.stringify(config));
+    }).catch(err => {
+      process.stderr.write(err.message);
+      process.exit(1);
+    });
+  `
+
+  try {
+    const result = execSync(`npx tsx -e "${script.replace(/"/g, '\\"')}"`, {
+      cwd: resolve(absPath, '..'),
+      encoding: 'utf-8',
+      timeout: 15000,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    })
+    const config = JSON.parse(result)
+    if (!config || !config.database) {
+      throw new Error('Config missing database field')
+    }
+    return config
+  } catch (err: any) {
+    throw new Error(
+      `Failed to load ${absPath}.\n` +
+      `Make sure tsx is installed: npm install tsx\n` +
+      `Error: ${err.stderr || err.message}`
+    )
+  }
+}
+
+function unwrapConfig(mod: any): WaveletConfig {
+  let config = mod.default ?? mod
+  if (config && typeof config === 'object' && 'default' in config) {
+    config = config.default
+  }
 
-  if (!config.database) {
+  if (!config || !config.database) {
     throw new Error(
       `wavelet.config.ts must export a config with a 'database' field.\n` +
       `Example:\n` +