@514labs/moose-lib 0.6.322-ci-9-g72529e37 → 0.6.322-ci-14-ga8e5dacb

package/dist/moose-runner.js

@@ -30,59 +30,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/compiler-config.ts
-function getSourceDir() {
-  return process.env.MOOSE_SOURCE_DIR || "app";
-}
-function hasCompiledArtifacts(projectRoot = process.cwd()) {
-  const sourceDir = getSourceDir();
-  const compiledIndexPath = import_path.default.join(
-    projectRoot,
-    ".moose",
-    "compiled",
-    sourceDir,
-    "index.js"
-  );
-  return (0, import_fs.existsSync)(compiledIndexPath);
-}
-function shouldUseCompiled(projectRoot = process.cwd()) {
-  const envSaysCompiled = process.env.MOOSE_USE_COMPILED === "true";
-  if (!envSaysCompiled) {
-    return false;
-  }
-  const hasArtifacts = hasCompiledArtifacts(projectRoot);
-  if (!hasArtifacts) {
-    console.warn(
-      `[moose] MOOSE_USE_COMPILED=true but no compiled artifacts found at .moose/compiled/${getSourceDir()}/index.js. Falling back to ts-node.`
-    );
-  }
-  return hasArtifacts;
-}
-var import_fs, import_path, MOOSE_COMPILER_PLUGINS, COMMANDS_REQUIRING_PLUGINS;
-var init_compiler_config = __esm({
-  "src/compiler-config.ts"() {
-    "use strict";
-    import_fs = require("fs");
-    import_path = __toESM(require("path"));
-    MOOSE_COMPILER_PLUGINS = [
-      {
-        transform: "./node_modules/@514labs/moose-lib/dist/compilerPlugin.js",
-        transformProgram: true
-      },
-      {
-        transform: "typia/lib/transform"
-      }
-    ];
-    COMMANDS_REQUIRING_PLUGINS = [
-      "consumption-apis",
-      "consumption-type-serializer",
-      "dmv2-serializer",
-      "streaming-functions",
-      "scripts"
-    ];
-  }
-});
-
 // src/dmv2/utils/stackTrace.ts
 var init_stackTrace = __esm({
   "src/dmv2/utils/stackTrace.ts"() {
@@ -1274,15 +1221,11 @@ var init_runner = __esm({
     init_cluster_utils();
     init_sqlHelpers();
     init_internal();
-    init_compiler_config();
     toClientConfig2 = (config) => ({
       ...config,
       useSSL: config.useSSL ? "true" : "false"
     });
-    createPath = (apisDir, path6, useCompiled2) => {
-      const extension = useCompiled2 ? ".js" : ".ts";
-      return `${apisDir}${path6}${extension}`;
-    };
+    createPath = (apisDir, path5) => `${apisDir}${path5}.ts`;
     httpLogger = (req, res, startMs) => {
       console.log(
         `${req.method} ${req.url} ${res.statusCode} ${Date.now() - startMs}ms`
@@ -1290,9 +1233,6 @@ var init_runner = __esm({
     };
     modulesCache = /* @__PURE__ */ new Map();
     apiHandler = async (publicKey, clickhouseClient, temporalClient, apisDir, enforceAuth, isDmv2, jwtConfig) => {
-      const useCompiled2 = shouldUseCompiled();
-      const sourceDir = getSourceDir();
-      const actualApisDir = useCompiled2 ? `${process.cwd()}/.moose/compiled/${sourceDir}/apis/` : apisDir;
       const apis = isDmv2 ? await getApis2() : /* @__PURE__ */ new Map();
       return async (req, res) => {
         const start = Date.now();
@@ -1330,7 +1270,7 @@ var init_runner = __esm({
             httpLogger(req, res, start);
             return;
           }
-          const pathName = createPath(actualApisDir, fileName, useCompiled2);
+          const pathName = createPath(apisDir, fileName);
           const paramsObject = Array.from(url.searchParams.entries()).reduce(
             (obj, [key, value]) => {
               const existingValue = obj[key];
@@ -1788,12 +1728,15 @@ var init_index = __esm({
 });
 
 // src/dmv2/internal.ts
+function getSourceDir() {
+  return import_process.default.env.MOOSE_SOURCE_DIR || "app";
+}
 function findSourceFiles(dir, extensions = [".ts", ".tsx", ".js", ".jsx", ".mts", ".cts"]) {
   const files = [];
   try {
     const entries = fs2.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path3.join(dir, entry.name);
+      const fullPath = path2.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name !== "node_modules" && !entry.name.startsWith(".")) {
           files.push(...findSourceFiles(fullPath, extensions));
@@ -1802,7 +1745,7 @@ function findSourceFiles(dir, extensions = [".ts", ".tsx", ".js", ".jsx", ".mts"
         if (entry.name.endsWith(".d.ts") || entry.name.endsWith(".d.mts") || entry.name.endsWith(".d.cts")) {
           continue;
         }
-        const ext = path3.extname(entry.name);
+        const ext = path2.extname(entry.name);
         if (extensions.includes(ext)) {
           files.push(fullPath);
         }
@@ -1814,12 +1757,12 @@ function findSourceFiles(dir, extensions = [".ts", ".tsx", ".js", ".jsx", ".mts"
   return files;
 }
 function findUnloadedFiles() {
-  const appDir = path3.resolve(import_process.default.cwd(), getSourceDir());
+  const appDir = path2.resolve(import_process.default.cwd(), getSourceDir());
   const allSourceFiles = findSourceFiles(appDir);
   const loadedFiles = new Set(
-    Object.keys(require.cache).filter((key) => key.startsWith(appDir)).map((key) => path3.resolve(key))
+    Object.keys(require.cache).filter((key) => key.startsWith(appDir)).map((key) => path2.resolve(key))
   );
-  const unloadedFiles = allSourceFiles.map((file) => path3.resolve(file)).filter((file) => !loadedFiles.has(file)).map((file) => path3.relative(import_process.default.cwd(), file));
+  const unloadedFiles = allSourceFiles.map((file) => path2.resolve(file)).filter((file) => !loadedFiles.has(file)).map((file) => path2.relative(import_process.default.cwd(), file));
   return unloadedFiles;
 }
 function isS3QueueConfig(config) {
@@ -2072,16 +2015,15 @@ function findTaskInTree(task, targetName) {
   }
   return void 0;
 }
-var import_process, fs2, path3, moose_internal, defaultRetentionPeriod, toInfraMap, getMooseInternal, dumpMooseInternal, loadIndex, getStreamingFunctions, getApis2, getWorkflows2, getTaskForWorkflow, getWebApps2;
+var import_process, fs2, path2, moose_internal, defaultRetentionPeriod, toInfraMap, getMooseInternal, dumpMooseInternal, loadIndex, getStreamingFunctions, getApis2, getWorkflows2, getTaskForWorkflow, getWebApps2;
 var init_internal = __esm({
   "src/dmv2/internal.ts"() {
     "use strict";
     import_process = __toESM(require("process"));
     fs2 = __toESM(require("fs"));
-    path3 = __toESM(require("path"));
+    path2 = __toESM(require("path"));
     init_index();
     init_commons();
-    init_compiler_config();
     moose_internal = {
       tables: /* @__PURE__ */ new Map(),
       streams: /* @__PURE__ */ new Map(),
@@ -2366,7 +2308,6 @@ var init_internal = __esm({
       );
     };
     loadIndex = () => {
-      const useCompiled2 = shouldUseCompiled();
       const registry = getMooseInternal();
       registry.tables.clear();
       registry.streams.clear();
@@ -2377,21 +2318,14 @@ var init_internal = __esm({
       registry.webApps.clear();
       registry.materializedViews.clear();
       registry.views.clear();
-      if (!useCompiled2) {
-        const appDir = `${import_process.default.cwd()}/${getSourceDir()}`;
-        Object.keys(require.cache).forEach((key) => {
-          if (key.startsWith(appDir)) {
-            delete require.cache[key];
-          }
-        });
-      }
-      try {
-        const sourceDir = getSourceDir();
-        if (useCompiled2) {
-          require(`${import_process.default.cwd()}/.moose/compiled/${sourceDir}/index.js`);
-        } else {
-          require(`${import_process.default.cwd()}/${sourceDir}/index.ts`);
+      const appDir = `${import_process.default.cwd()}/${getSourceDir()}`;
+      Object.keys(require.cache).forEach((key) => {
+        if (key.startsWith(appDir)) {
+          delete require.cache[key];
         }
+      });
+      try {
+        require(`${import_process.default.cwd()}/${getSourceDir()}/index.ts`);
       } catch (error) {
         let hint;
         let includeDetails = true;
@@ -2499,7 +2433,6 @@ var init_internal = __esm({
 
 // src/moose-runner.ts
 var import_ts_node = require("ts-node");
-init_compiler_config();
 init_internal();
 
 // src/blocks/runner.ts
@@ -2507,7 +2440,6 @@ var import_fastq = __toESM(require("fastq"));
 init_commons();
 var import_node_fs = __toESM(require("fs"));
 var import_node_path2 = __toESM(require("path"));
-init_compiler_config();
 var walkDir = (dir, fileExtension, fileList) => {
   const files = import_node_fs.default.readdirSync(dir);
   files.forEach((file) => {
@@ -2579,11 +2511,7 @@ var asyncWorker = async (task) => {
 var runBlocks = async (config) => {
   const chClient = getClickhouseClient(toClientConfig3(config.clickhouseConfig));
   console.log(`Connected`);
-  const useCompiled2 = shouldUseCompiled();
-  const sourceDir = getSourceDir();
-  const blocksDir = useCompiled2 ? `${process.cwd()}/.moose/compiled/${sourceDir}/blocks/` : config.blocksDir;
-  const fileExtension = useCompiled2 ? ".js" : ".ts";
-  const blocksFiles = walkDir(blocksDir, fileExtension, []);
+  const blocksFiles = walkDir(config.blocksDir, ".ts", []);
   const numOfBlockFiles = blocksFiles.length;
   console.log(`Found ${numOfBlockFiles} blocks files`);
   const queue = import_fastq.default.promise(asyncWorker, 1);
@@ -2594,10 +2522,10 @@ var runBlocks = async (config) => {
       }
     }
   });
-  for (const path6 of blocksFiles) {
-    console.log(`Adding to queue: ${path6}`);
+  for (const path5 of blocksFiles) {
+    console.log(`Adding to queue: ${path5}`);
     try {
-      const blocks = require(path6).default;
+      const blocks = require(path5).default;
       queue.push({
         chClient,
         blocks,
@@ -2606,7 +2534,7 @@ var runBlocks = async (config) => {
     } catch (err) {
       cliLog({
         action: "Blocks",
-        message: `Failed to import blocks from ${path6}: ${err}`,
+        message: `Failed to import blocks from ${path5}: ${err}`,
         message_type: "Error"
       });
     }
@@ -2904,8 +2832,7 @@ var sendMessageMetrics = (logger2, metrics) => {
 function loadStreamingFunction(functionFilePath) {
   let streamingFunctionImport;
   try {
-    const pathWithoutExt = functionFilePath.replace(/\.(ts|js)$/, "");
-    streamingFunctionImport = require(pathWithoutExt);
+    streamingFunctionImport = require(functionFilePath.substring(0, functionFilePath.length - 3));
   } catch (e) {
     cliLog({ action: "Function", message: `${e}`, message_type: "Error" });
     throw e;
@@ -3177,32 +3104,18 @@ var runStreamingFunctions = async (args) => {
 };
 
 // src/moduleExportSerializer.ts
-init_compiler_config();
 async function runExportSerializer(targetModel) {
-  const useCompiled2 = shouldUseCompiled();
-  const sourceDir = getSourceDir();
-  let modulePath = targetModel;
-  if (useCompiled2) {
-    if (modulePath.includes(sourceDir)) {
-      modulePath = modulePath.replace(
-        new RegExp(`/${sourceDir}/`),
-        `/.moose/compiled/${sourceDir}/`
-      );
-    }
-    modulePath = modulePath.replace(/\.ts$/, ".js");
-  }
-  const exports_list = require(modulePath);
+  const exports_list = require(targetModel);
   console.log(JSON.stringify(exports_list));
 }
 
 // src/consumption-apis/exportTypeSerializer.ts
 var import_process2 = __toESM(require("process"));
-init_compiler_config();
+function getSourceDir2() {
+  return import_process2.default.env.MOOSE_SOURCE_DIR || "app";
+}
 async function runApiTypeSerializer(targetModel) {
-  const sourceDir = getSourceDir();
-  const useCompiled2 = shouldUseCompiled();
-  const apiPath = useCompiled2 ? `${import_process2.default.cwd()}/.moose/compiled/${sourceDir}/apis/${targetModel}.js` : `${import_process2.default.cwd()}/${sourceDir}/apis/${targetModel}.ts`;
-  const func = require(apiPath).default;
+  const func = require(`${import_process2.default.cwd()}/${getSourceDir2()}/apis/${targetModel}.ts`).default;
   const inputSchema = func["moose_input_schema"] || null;
   const outputSchema = func["moose_output_schema"] || null;
   console.log(
@@ -3215,7 +3128,7 @@ async function runApiTypeSerializer(targetModel) {
 
 // src/scripts/runner.ts
 var import_worker2 = require("@temporalio/worker");
-var path5 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var fs4 = __toESM(require("fs"));
 init_internal();
 
@@ -3508,7 +3421,7 @@ async function registerWorkflows(logger2, config) {
       }
     };
     const workflowBundle = await (0, import_worker2.bundleWorkflowCode)({
-      workflowsPath: path5.resolve(__dirname, "scripts/workflow.js"),
+      workflowsPath: path4.resolve(__dirname, "scripts/workflow.js"),
       logger: silentLogger
     });
     const worker = await import_worker2.Worker.create({
@@ -3589,27 +3502,31 @@ async function runScripts(config) {
 // src/moose-runner.ts
 var import_process3 = __toESM(require("process"));
 var import_commander = require("commander");
-var useCompiled = shouldUseCompiled();
-if (!useCompiled) {
-  const command = import_process3.default.argv[2];
-  const needsPlugins = COMMANDS_REQUIRING_PLUGINS.includes(command);
-  if (needsPlugins) {
-    (0, import_ts_node.register)({
-      require: ["tsconfig-paths/register"],
-      esm: true,
-      experimentalTsImportSpecifiers: true,
-      compiler: "ts-patch/compiler",
-      compilerOptions: {
-        plugins: [...MOOSE_COMPILER_PLUGINS],
-        experimentalDecorators: true
-      }
-    });
-  } else {
-    (0, import_ts_node.register)({
-      esm: true,
-      experimentalTsImportSpecifiers: true
-    });
-  }
+if (import_process3.default.argv[2] == "consumption-apis" || import_process3.default.argv[2] == "consumption-type-serializer" || import_process3.default.argv[2] == "dmv2-serializer" || // Streaming functions for dmv2 need to load moose internals
+import_process3.default.argv[2] == "streaming-functions" || import_process3.default.argv[2] == "scripts") {
+  (0, import_ts_node.register)({
+    require: ["tsconfig-paths/register"],
+    esm: true,
+    experimentalTsImportSpecifiers: true,
+    compiler: "ts-patch/compiler",
+    compilerOptions: {
+      plugins: [
+        {
+          transform: `./node_modules/@514labs/moose-lib/dist/compilerPlugin.js`,
+          transformProgram: true
+        },
+        {
+          transform: "typia/lib/transform"
+        }
+      ],
+      experimentalDecorators: true
+    }
+  });
+} else {
+  (0, import_ts_node.register)({
+    esm: true,
+    experimentalTsImportSpecifiers: true
+  });
 }
 var program = new import_commander.Command();
 program.name("moose-runner").description("Moose runner for various operations").version("1.0.0");