cloud-run-functions 0.1.1 → 0.1.3

package/dist/main.js

@@ -1,29 +1,53 @@
 // src/main.ts
-import * as ordana from "ordana";
-var command = ordana.parse(process.argv.slice(2), {
+import {
+  command,
+  option,
+  optional,
+  positional,
+  run,
+  string,
+  subcommands
+} from "cmd-ts";
+var dev = command({
+  name: "dev",
+  description: "Start the development server",
+  args: {
+    root: positional({
+      type: optional(string),
+      displayName: "root",
+      description: "Directory to search for function entrypoints"
+    }),
+    port: option({
+      type: optional(string),
+      long: "port",
+      short: "p",
+      description: "The port to use for the development server"
+    })
+  },
+  async handler({ root, port }) {
+    const { dev: dev2 } = await import("./tools/dev.js");
+    await dev2(root, { port });
+  }
+});
+var build = command({
+  name: "build",
+  description: "Generate a bundle for each function",
+  args: {
+    root: positional({
+      type: optional(string),
+      displayName: "root",
+      description: "Directory to search for function entrypoints"
+    })
+  },
+  async handler() {
+    throw new Error("Not implemented");
+  }
+});
+var cli = subcommands({
   name: "cloud-run-functions",
-  subcommands: {
-    dev: {
-      description: "Start the development server",
-      positionals: { maximum: 1 }
-    },
-    build: {
-      description: "Generate a bundle for each function",
-      positionals: { maximum: 1 }
-    }
+  cmds: {
+    dev,
+    build
   }
 });
-if (command.type === "help") {
-  console.log(ordana.generateHelpMessage(command));
-} else {
-  const subcommands = {
-    async dev() {
-      const { dev } = await import("./tools/dev.js");
-      await dev(command.positionals[0]);
-    },
-    async build() {
-      throw new Error("Not implemented");
-    }
-  };
-  await subcommands[command.subcommand]();
-}
+await run(cli, process.argv.slice(2));

package/dist/targets/dev.js

@@ -2,10 +2,11 @@
 import "source-map-support/register.js";
 import functions from "@google-cloud/functions-framework";
 import esbuild from "esbuild";
+import { findUpSync } from "find-up-simple";
 import fs2 from "node:fs";
 import { Module } from "node:module";
 import os from "node:os";
-import path2 from "node:path";
+import path3 from "node:path";
 
 // node_modules/.pnpm/radashi@12.4.0/node_modules/radashi/dist/radashi.js
 var TimeoutError = class extends Error {
@@ -73,10 +74,54 @@ function isTagged(value, tag) {
   return Object.prototype.toString.call(value) === tag;
 }
 
+// src/common/emptyDir.ts
+import fs from "node:fs";
+function emptyDir(dir) {
+  fs.rmSync(dir, { recursive: true, force: true });
+  fs.mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+// src/common/functionFilter.ts
+import path from "node:path";
+function getFunctionFilter(options) {
+  const functionGlobs = [];
+  const functionSuffixes = /* @__PURE__ */ new Set();
+  const requiredSuffix = options.entrySuffix?.replace(/^\.?/, ".") ?? "";
+  for (const glob of options.globs ?? ["**/*"]) {
+    let ext = path.extname(glob);
+    if (ext) {
+      functionSuffixes.add(requiredSuffix + ext);
+      functionGlobs.push(
+        requiredSuffix ? glob.replace(ext, requiredSuffix + ext) : glob
+      );
+      continue;
+    }
+    for (ext of options.extensions ?? [".ts", ".js"]) {
+      ext = requiredSuffix + ext;
+      functionSuffixes.add(ext);
+      functionGlobs.push(glob + ext);
+    }
+  }
+  const suffixPattern = new RegExp(
+    `(${Array.from(functionSuffixes, (e) => e.replace(/\./g, "\\.")).sort((a, b) => b.length - a.length).join("|")})$`
+  );
+  return {
+    globs: functionGlobs,
+    suffixPattern
+  };
+}
+
+// src/common/hash.ts
+import crypto from "node:crypto";
+function hash(data, len) {
+  return crypto.createHash("sha256").update(data).digest("hex").slice(0, len);
+}
+
 // src/config/index.ts
 import * as z2 from "@zod/mini";
 import Joycon from "joycon";
-import path from "node:path";
+import path2 from "node:path";
 
 // src/config/schema.ts
 import * as z from "@zod/mini";
@@ -140,53 +185,19 @@ function loadConfig(cwd) {
   }
   return {
     ...z2.parse(configSchema, result.data),
-    configDir: path.dirname(result.path)
+    configDir: path2.dirname(result.path)
   };
 }
 
-// src/utils/emptyDir.ts
-import fs from "node:fs";
-function emptyDir(dir) {
-  fs.rmSync(dir, { recursive: true, force: true });
-  fs.mkdirSync(dir, { recursive: true });
-  return dir;
-}
-
-// src/utils/hash.ts
-import crypto from "node:crypto";
-function hash(data, len) {
-  return crypto.createHash("sha256").update(data).digest("hex").slice(0, len);
-}
-
 // src/targets/dev.ts
 async function createBuild() {
   const options = JSON.parse(process.env.CRF_OPTIONS);
-  const searchDir = path2.resolve(options.workingDir, options.searchDir ?? "");
+  const searchDir = path3.resolve(options.workingDir, options.searchDir ?? "");
   const config = loadConfig(searchDir);
-  const root = config.configDir ? path2.resolve(config.configDir, config.root ?? "") : searchDir;
-  const entryPoints = [];
-  const requiredSuffix = config.entrySuffix?.replace(/^\.?/, ".") ?? "";
-  const knownSuffixes = /* @__PURE__ */ new Set();
-  for (const glob of config.globs ?? ["**/*"]) {
-    let ext = path2.extname(glob);
-    if (ext) {
-      knownSuffixes.add(requiredSuffix + ext);
-      entryPoints.push(
-        requiredSuffix ? glob.replace(ext, requiredSuffix + ext) : glob
-      );
-      continue;
-    }
-    for (ext of config.extensions ?? [".ts", ".js"]) {
-      ext = requiredSuffix + ext;
-      knownSuffixes.add(ext);
-      entryPoints.push(glob + ext);
-    }
-  }
-  const knownSuffixesRE = new RegExp(
-    `(${Array.from(knownSuffixes, (e) => e.replace(/\./g, "\\.")).sort((a, b) => b.length - a.length).join("|")})$`
-  );
+  const root = config.configDir ? path3.resolve(config.configDir, config.root ?? "") : searchDir;
+  const functionFilter = getFunctionFilter(config);
   const cacheDir = emptyDir(
-    path2.join(
+    path3.join(
       fs2.realpathSync(os.tmpdir()),
       "cloud-run-functions-" + hash(root, 8)
     )
@@ -194,7 +205,7 @@ async function createBuild() {
   let pendingBuild;
   let finishedBuild;
   const context = await esbuild.context({
-    entryPoints,
+    entryPoints: functionFilter.globs,
     absWorkingDir: root,
     outdir: cacheDir,
     define: options.define,
@@ -229,11 +240,14 @@ async function createBuild() {
   });
   await context.watch();
   console.log("[esbuild] Watching for changes...");
-  try {
-    const dotenv = await import("dotenv");
-    dotenv.config();
-    console.log("[dotenv] Environment variables loaded.");
-  } catch {
+  const envPath = findUpSync(".env", { cwd: root });
+  if (envPath) {
+    try {
+      const dotenv = await import("dotenv");
+      dotenv.config({ path: envPath });
+      console.log("[dotenv] Environment variables loaded.");
+    } catch {
+    }
   }
   const taskStates = /* @__PURE__ */ new Map();
   return {
@@ -248,7 +262,10 @@ async function createBuild() {
         if (!output.entryPoint) {
           continue;
         }
-        const taskName = output.entryPoint.replace(knownSuffixesRE, "");
+        const taskName = output.entryPoint.replace(
+          functionFilter.suffixPattern,
+          ""
+        );
         if (url.pathname === "/" + taskName) {
           const taskState = taskStates.get(taskName) ?? {
             running: 0,
@@ -270,7 +287,7 @@ async function createBuild() {
           taskState.running++;
           taskStates.set(taskName, taskState);
           const require2 = Module.createRequire(import.meta.filename);
-          let taskHandler = require2(path2.join(root, file));
+          let taskHandler = require2(path3.join(root, file));
           while (taskHandler && typeof taskHandler !== "function") {
             taskHandler = taskHandler.default;
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-run-functions",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "bin": "./dist/main.js",
   "exports": {
     "types": "./dist/index.d.ts",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@zod/mini": "4.0.0-beta.0",
+    "cmd-ts": "^0.14.3",
     "esbuild": "^0.25.4",
     "find-up-simple": "^1.0.1",
     "joycon": "^3.1.1",
-    "ordana": "^0.4.0",
     "picospawn": "^0.3.2",
     "source-map-support": "^0.5.21",
     "tinyglobby": "^0.2.13"