@faasjs/dev 8.0.0-beta.5 → 8.0.0-beta.6

package/dist/index.mjs

@@ -1,5 +1,7 @@
-import { readFileSync } from 'fs';
-import { knex } from 'knex';
+import { __export, isTypegenSourceFile, generateFaasTypes, __reExport, resolveServerConfig } from './chunk-3FXFWIBW.mjs';
+export { generateFaasTypes, isTypegenSourceFile } from './chunk-3FXFWIBW.mjs';
+import { types, PGlite } from '@electric-sql/pglite';
+import knex from 'knex';
 import PgliteDialect from 'knex-pglite';
 import { brotliDecompressSync, gunzipSync, inflateSync } from 'zlib';
 import { deepMerge } from '@faasjs/deep_merge';
@@ -10,42 +12,42 @@ import * as func_star from '@faasjs/func';
 import { join } from 'path';
 import { Server } from '@faasjs/server';
 
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget);
-
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
   FuncWarper: () => FuncWarper,
   createPgliteKnex: () => createPgliteKnex,
+  generateFaasTypes: () => generateFaasTypes,
+  isTypegenSourceFile: () => isTypegenSourceFile,
   mountFaasKnex: () => mountFaasKnex,
-  runPgliteSql: () => runPgliteSql,
-  runPgliteSqlFile: () => runPgliteSqlFile,
   streamToString: () => streamToString,
   test: () => test,
   unmountFaasKnex: () => unmountFaasKnex,
   viteFaasJsServer: () => viteFaasJsServer
 });
+var postgresTypeParsers = {
+  [types.INT2]: (v) => Number.parseInt(v, 10),
+  [types.INT4]: (v) => Number.parseInt(v, 10),
+  [types.INT8]: (v) => Number.parseInt(v, 10),
+  [types.FLOAT4]: (v) => Number.parseFloat(v),
+  [types.FLOAT8]: (v) => Number.parseFloat(v),
+  [types.NUMERIC]: (v) => Number.parseFloat(v)
+};
 function createPgliteKnex(config = {}, connection = {}) {
+  const pgliteConnection = connection;
+  const dataDir = typeof pgliteConnection.filename === "string" ? pgliteConnection.filename : typeof pgliteConnection.connectionString === "string" ? pgliteConnection.connectionString : void 0;
+  const pglite = new PGlite({
+    ...dataDir ? { dataDir } : {},
+    parsers: postgresTypeParsers
+  });
+  const pgliteKnexConnection = {
+    ...connection,
+    pglite
+  };
   return knex({
     ...config,
     client: PgliteDialect,
-    connection
+    connection: pgliteKnexConnection
   });
 }
 function mountFaasKnex(db, options = {}) {
@@ -63,17 +65,6 @@ function unmountFaasKnex(name = "knex") {
   if (!globalWithFaasKnex.FaasJS_Knex) return;
   delete globalWithFaasKnex.FaasJS_Knex[name];
 }
-async function runPgliteSql(db, sql) {
-  if (!sql.trim()) return;
-  await db.raw(sql);
-}
-async function runPgliteSqlFile(db, filePath, options = {}) {
-  const stripUuidOsspExtension = options.stripUuidOsspExtension !== false;
-  let sql = readFileSync(filePath, "utf8");
-  if (stripUuidOsspExtension)
-    sql = sql.replace(/CREATE EXTENSION IF NOT EXISTS "uuid-ossp";\s*/gi, "");
-  await runPgliteSql(db, sql);
-}
 
 // src/test.ts
 var test_exports = {};
@@ -109,8 +100,7 @@ var FuncWarper = class {
   plugins;
   _handler;
   /**
-   * @param file {string} Full file path
-   * @param func {Func} A FaasJs function
+   * @param initBy {Func} A FaasJS function
    * ```ts
    * import { FuncWarper } from '@faasjs/dev'
    *
@@ -253,6 +243,7 @@ function test(initBy) {
 
 // src/index.ts
 __reExport(index_exports, test_exports);
+var TYPEGEN_DEBOUNCE = 120;
 function normalizeBase(base) {
   const normalized = base.startsWith("/") ? base : `/${base}`;
   if (normalized === "/") return "/";
@@ -268,7 +259,7 @@ function stripBase(url, base) {
     return `${pathname.slice(base.length)}${search}`;
   return url;
 }
-function viteFaasJsServer(options = {}) {
+function viteFaasJsServer() {
   let config;
   let server = null;
   const logger = new Logger("FaasJs:Vite");
@@ -276,20 +267,64 @@ function viteFaasJsServer(options = {}) {
     name: "vite:faasjs",
     enforce: "pre",
     configResolved(resolvedConfig) {
-      const root = options.root || resolvedConfig.root;
-      const base = normalizeBase(options.base || resolvedConfig.base);
+      const serverConfig = resolveServerConfig(
+        resolvedConfig.root,
+        logger,
+        resolvedConfig.base
+      );
       config = {
-        root,
-        base
+        root: serverConfig.root,
+        base: normalizeBase(serverConfig.base)
       };
     },
-    configureServer: async ({ middlewares }) => {
+    configureServer: async ({ middlewares, watcher }) => {
       if (process.env.VITEST) {
         logger.debug("Skipping faas server in vitest environment");
         return;
       }
       if (!config) throw new Error("viteFaasJsServer: config is not resolved");
       server = new Server(join(config.root, "src"));
+      const runTypegen = async () => {
+        try {
+          const result = await generateFaasTypes({
+            root: config.root
+          });
+          logger.debug(
+            "[faas-types] %s %s (%i routes)",
+            result.changed ? "generated" : "up-to-date",
+            result.output,
+            result.routeCount
+          );
+        } catch (error) {
+          logger.error("[faas-types] %s", error.message);
+        }
+      };
+      let timer = null;
+      let runningTypegen = false;
+      let pendingTypegen = false;
+      const flushTypegen = async () => {
+        if (runningTypegen || !pendingTypegen) return;
+        pendingTypegen = false;
+        runningTypegen = true;
+        try {
+          await runTypegen();
+        } finally {
+          runningTypegen = false;
+          if (pendingTypegen) void flushTypegen();
+        }
+      };
+      const scheduleTypegen = () => {
+        pendingTypegen = true;
+        if (timer) clearTimeout(timer);
+        timer = setTimeout(() => {
+          void flushTypegen();
+        }, TYPEGEN_DEBOUNCE);
+      };
+      await runTypegen();
+      watcher.on("all", (_eventName, filePath) => {
+        if (!isTypegenSourceFile(filePath)) return;
+        scheduleTypegen();
+      });
       middlewares.use(async (req, res, next) => {
         if (!req.url || req.method !== "POST" || !server) return next();
         const originalUrl = req.url;
@@ -320,4 +355,4 @@ function viteFaasJsServer(options = {}) {
   };
 }
 
-export { FuncWarper, createPgliteKnex, mountFaasKnex, runPgliteSql, runPgliteSqlFile, streamToString, test, unmountFaasKnex, viteFaasJsServer };
+export { FuncWarper, createPgliteKnex, mountFaasKnex, streamToString, test, unmountFaasKnex, viteFaasJsServer };

package/faas-types.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+import { main } from './dist/cli.mjs'
+
+main(process.argv).then(code => {
+  if (code !== 0) process.exit(code)
+})

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@faasjs/dev",
-  "version": "v8.0.0-beta.5",
+  "version": "8.0.0-beta.6",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "bin": {
+    "faas-types": "faas-types.mjs"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -24,33 +27,40 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --config ../../tsup.config.ts"
+    "build": "tsup-node --entry src/index.ts --entry src/cli.ts --config ../../tsup.config.ts"
   },
   "files": [
-    "dist"
+    "dist",
+    "faas-types.mjs"
   ],
   "peerDependencies": {
-    "@faasjs/deep_merge": ">=v8.0.0-beta.5",
-    "@faasjs/func": ">=v8.0.0-beta.5",
-    "@faasjs/http": ">=v8.0.0-beta.5",
-    "@faasjs/server": ">=v8.0.0-beta.5",
-    "@faasjs/knex": ">=v8.0.0-beta.5",
-    "@faasjs/load": ">=v8.0.0-beta.5",
-    "@faasjs/logger": ">=v8.0.0-beta.5",
+    "@electric-sql/pglite": "*",
+    "@faasjs/deep_merge": ">=8.0.0-beta.6",
+    "@faasjs/func": ">=8.0.0-beta.6",
+    "@faasjs/http": ">=8.0.0-beta.6",
+    "@faasjs/server": ">=8.0.0-beta.6",
+    "@faasjs/knex": ">=8.0.0-beta.6",
+    "@faasjs/load": ">=8.0.0-beta.6",
+    "@faasjs/logger": ">=8.0.0-beta.6",
+    "@types/node": "*",
     "knex": "*",
     "vite": "*",
+    "vitest": "*",
     "knex-pglite": "*"
   },
   "devDependencies": {
-    "@faasjs/deep_merge": ">=v8.0.0-beta.5",
-    "@faasjs/func": ">=v8.0.0-beta.5",
-    "@faasjs/http": ">=v8.0.0-beta.5",
-    "@faasjs/server": ">=v8.0.0-beta.5",
-    "@faasjs/knex": ">=v8.0.0-beta.5",
-    "@faasjs/load": ">=v8.0.0-beta.5",
-    "@faasjs/logger": ">=v8.0.0-beta.5",
+    "@electric-sql/pglite": "*",
+    "@faasjs/deep_merge": ">=8.0.0-beta.6",
+    "@faasjs/func": ">=8.0.0-beta.6",
+    "@faasjs/http": ">=8.0.0-beta.6",
+    "@faasjs/server": ">=8.0.0-beta.6",
+    "@faasjs/knex": ">=8.0.0-beta.6",
+    "@faasjs/load": ">=8.0.0-beta.6",
+    "@faasjs/logger": ">=8.0.0-beta.6",
+    "@types/node": "*",
     "knex": "*",
     "vite": "*",
+    "vitest": "*",
     "knex-pglite": "*"
   },
   "engines": {