npm - create-faas-app - Versions diffs - 8.0.0-beta.3 → 8.0.0-beta.5 - Mend

create-faas-app 8.0.0-beta.3 → 8.0.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.cjs CHANGED Viewed

@@ -10,7 +10,7 @@ var enquirer = require('enquirer');
 // package.json
 var package_default = {
-  version: "v8.0.0-beta.2"};
+  version: "v8.0.0-beta.4"};
 var Validator = {
   name(input) {
     const match = /^[a-z0-9-_]+$/i.test(input) ? true : "Must be a-z, 0-9 or -_";
@@ -20,126 +20,280 @@ var Validator = {
     return true;
   }
 };
-async function action(options = {}) {
-  const answers = Object.assign(options, {});
-  if (!options.name || Validator.name(options.name) !== true)
-    answers.name = await enquirer.prompt({
-      type: "input",
-      name: "value",
-      message: "Project name",
-      initial: "faasjs",
-      validate: Validator.name
-    }).then((res) => res.value);
-  if (!answers.name) return;
-  fs.mkdirSync(answers.name);
-  const runtime = process.versions.bun ? "bun" : "npm";
-  fs.writeFileSync(
-    path.join(answers.name, "faas.yaml"),
-    `defaults:
-  plugins:
-development:
-testing:
-staging:
-production:
+function writeFile(path$1, content) {
+  fs.mkdirSync(path.dirname(path$1), {
+    recursive: true
+  });
+  fs.writeFileSync(path$1, content);
+}
+function buildPackageJSON(name) {
+  return `${JSON.stringify(
+    {
+      name,
+      private: true,
+      type: "module",
+      version: "1.0.0",
+      scripts: {
+        dev: "vite",
+        build: "vite build",
+        start: "node server.ts",
+        check: "tsc --noEmit && biome check .",
+        test: "vitest run"
+      },
+      dependencies: {
+        "@faasjs/func": "*",
+        "@faasjs/http": "*",
+        faasjs: "*",
+        react: "*",
+        "react-dom": "*",
+        zod: "*"
+      },
+      devDependencies: {
+        "@biomejs/biome": "*",
+        "@faasjs/dev": "*",
+        "@faasjs/lint": "*",
+        "@types/node": "*",
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "@vitejs/plugin-react": "*",
+        jsdom: "*",
+        typescript: "*",
+        vite: "*",
+        vitest: "*"
+      }
+    },
+    null,
+    2
+  )}
+`;
+}
+function scaffold(rootPath) {
+  writeFile(
+    path.join(rootPath, ".gitignore"),
+    `node_modules/
+dist/
+coverage/
 `
   );
-  fs.writeFileSync(
-    path.join(answers.name, "package.json"),
+  writeFile(
+    path.join(rootPath, "biome.json"),
     `{
-  "name": "${answers.name}",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "serve": "faas server",
-    "test": "vitest run"
-  },
-  "dependencies": {
-    "faasjs": "*"
-  },
-  "devDependencies": {
-    "vitest": "*"
-  }
-}`
+  "extends": ["@faasjs/lint/biome"]
+}
+`
   );
-  fs.writeFileSync(
-    path.join(answers.name, "tsconfig.json"),
+  writeFile(
+    path.join(rootPath, "tsconfig.json"),
     `{
   "compilerOptions": {
-    "downlevelIteration": true,
-    "esModuleInterop": true,
-    "target": "ES2019",
+    "target": "ES2022",
     "module": "ESNext",
-    "moduleResolution": "node",
-    "baseUrl": "."
-  }
+    "moduleResolution": "Bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "types": ["vitest/globals"]
+  },
+  "include": ["src", "vite.config.ts", "server.ts"]
 }
 `
   );
-  fs.writeFileSync(
-    path.join(answers.name, ".gitignore"),
-    `node_modules/
-tmp/
-coverage/
-*.tmp.js
+  writeFile(
+    path.join(rootPath, "index.html"),
+    `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>FaasJS App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
 `
   );
-  fs.mkdirSync(path.join(answers.name, ".vscode"));
-  fs.writeFileSync(
-    path.join(answers.name, ".vscode", "settings.json"),
-    `{
-  "editor.detectIndentation": true,
-  "editor.insertSpaces": true,
-  "editor.tabSize": 2,
-  "editor.codeActionsOnSave": {
-    "source.fixAll": true
+  writeFile(
+    path.join(rootPath, "vite.config.ts"),
+    `import { viteFaasJsServer } from '@faasjs/dev'
+import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite'
+export default defineConfig({
+  server: {
+    host: '0.0.0.0',
   },
-  "editor.wordWrap": "on",
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true
-}
+  plugins: [react(), viteFaasJsServer()],
+})
 `
   );
-  fs.writeFileSync(
-    path.join(answers.name, ".vscode", "extensions.json"),
-    `{
-  "recommendations": [
-    "faasjs.faasjs-snippets"
-  ]
+  writeFile(
+    path.join(rootPath, "server.ts"),
+    `import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { Server, staticHandler } from '@faasjs/server'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+const publicHandler = staticHandler({
+  root: join(__dirname, 'public'),
+  notFound: false,
+})
+const distHandler = staticHandler({
+  root: join(__dirname, 'dist'),
+  notFound: 'index.html',
+})
+new Server(join(__dirname, 'src'), {
+  beforeHandle: async (req, res, ctx) => {
+    if (!req.url || req.method !== 'GET') return
+    await publicHandler(req, res, ctx)
+    await distHandler(req, res, ctx)
+  },
+}).listen()
+`
+  );
+  writeFile(
+    path.join(rootPath, "src", "faas.yaml"),
+    `defaults:
+  plugins:
+    http:
+      config:
+        cookie:
+          secure: false
+          session:
+            secret: secret
+development:
+testing:
+production:
+`
+  );
+  writeFile(
+    path.join(rootPath, "src", "main.tsx"),
+    `import { createRoot } from 'react-dom/client'
+import HomePage from './pages/home'
+createRoot(document.getElementById('root') as HTMLElement).render(<HomePage />)
+`
+  );
+  writeFile(
+    path.join(rootPath, "src", "pages", "home", "index.tsx"),
+    `import { useState } from 'react'
+type ApiResponse = {
+  ok: boolean
+  data: string
+  error: null | {
+    code?: string
+    message: string
+  }
+}
+export default function HomePage() {
+  const [message, setMessage] = useState('Click button to call API')
+  const [loading, setLoading] = useState(false)
+  const fetchMessage = async () => {
+    setLoading(true)
+    try {
+      const data = await fetch('/home/api/hello', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ name: 'world' }),
+      }).then(res => res.json() as Promise<ApiResponse>)
+      if (data.ok) setMessage(data.data)
+      else setMessage(data.error?.message || 'Unknown error')
+    } catch (error: any) {
+      setMessage(error?.message || 'Unknown error')
+    } finally {
+      setLoading(false)
+    }
+  }
+  return (
+    <main style={{ margin: '5rem auto', maxWidth: 420, padding: 24 }}>
+      <h1>FaasJS Starter</h1>
+      <p>{message}</p>
+      <button type="button" onClick={fetchMessage} disabled={loading}>
+        {loading ? 'Loading...' : 'Call /home/api/hello'}
+      </button>
+    </main>
+  )
 }
 `
   );
-  child_process.execSync(`cd ${answers.name} && ${runtime} install`, { stdio: "inherit" });
-  fs.writeFileSync(
-    path.join(answers.name, "index.func.ts"),
-    `import { useFunc } from '@faasjs/func'
-import { useHttp } from '@faasjs/http'
+  writeFile(
+    path.join(rootPath, "src", "pages", "home", "api", "hello.func.ts"),
+    `import { defineFunc } from '@faasjs/func'
+import { z } from 'zod'
-export const func = useFunc(() => {
-  const http = useHttp<{ name: string }>()
+const schema = z
+  .object({
+    name: z.string().optional(),
+  })
+  .required()
-  return async () => \`Hello, \${http.params.name}\`
-})
+export const func = defineFunc<{ params?: z.infer<typeof schema> }>(
+  async ({ event }) => {
+    const parsed = schema.parse(event.params || {})
+    return {
+      ok: true,
+      data: \`Hello, \${parsed.name || 'FaasJS'}\`,
+      error: null,
+    }
+  }
+)
 `
   );
-  fs.mkdirSync(path.join(answers.name, "__tests__"));
-  fs.writeFileSync(
-    path.join(answers.name, "__tests__", "index.test.ts"),
-    `import { test } from '@faasjs/test'
-import { func } from '../index.func'
+  writeFile(
+    path.join(rootPath, "src", "pages", "home", "api", "__tests__", "hello.test.ts"),
+    `import { test } from '@faasjs/dev'
+import { func } from '../hello.func'
-describe('hello', () => {
+describe('home/api/hello', () => {
   it('should work', async () => {
     const testFunc = test(func)
-    const { statusCode, data } = await testFunc.JSONhandler<string>({ name: 'world' })
+    const { statusCode, data } = await testFunc.JSONhandler({ name: 'world' })
     expect(statusCode).toEqual(200)
-    expect(data).toEqual('Hello, world')
+    expect(data).toEqual({
+      ok: true,
+      data: 'Hello, world',
+      error: null,
+    })
   })
 })
 `
   );
+}
+async function action(options = {}) {
+  const answers = Object.assign(options, {});
+  if (!options.name || Validator.name(options.name) !== true)
+    answers.name = await enquirer.prompt({
+      type: "input",
+      name: "value",
+      message: "Project name",
+      initial: "faasjs",
+      validate: Validator.name
+    }).then((res) => res.value);
+  if (!answers.name) return;
+  const runtime = process.versions.bun ? "bun" : "npm";
+  fs.mkdirSync(answers.name);
+  fs.writeFileSync(
+    path.join(answers.name, "package.json"),
+    buildPackageJSON(answers.name)
+  );
+  scaffold(answers.name);
+  child_process.execSync(`cd ${answers.name} && ${runtime} install`, { stdio: "inherit" });
   if (runtime === "bun") {
     child_process.execSync(`cd ${answers.name} && bun test`, { stdio: "inherit" });
   } else child_process.execSync(`cd ${answers.name} && npm run test`, { stdio: "inherit" });

package/dist/index.mjs CHANGED Viewed

@@ -1,14 +1,14 @@
 import { Command } from 'commander';
 import { execSync } from 'child_process';
 import { mkdirSync, writeFileSync, existsSync } from 'fs';
-import { join } from 'path';
+import { join, dirname } from 'path';
 import { prompt } from 'enquirer';
 // src/index.ts
 // package.json
 var package_default = {
-  version: "v8.0.0-beta.2"};
+  version: "v8.0.0-beta.4"};
 var Validator = {
   name(input) {
     const match = /^[a-z0-9-_]+$/i.test(input) ? true : "Must be a-z, 0-9 or -_";
@@ -18,126 +18,280 @@ var Validator = {
     return true;
   }
 };
-async function action(options = {}) {
-  const answers = Object.assign(options, {});
-  if (!options.name || Validator.name(options.name) !== true)
-    answers.name = await prompt({
-      type: "input",
-      name: "value",
-      message: "Project name",
-      initial: "faasjs",
-      validate: Validator.name
-    }).then((res) => res.value);
-  if (!answers.name) return;
-  mkdirSync(answers.name);
-  const runtime = process.versions.bun ? "bun" : "npm";
-  writeFileSync(
-    join(answers.name, "faas.yaml"),
-    `defaults:
-  plugins:
-development:
-testing:
-staging:
-production:
+function writeFile(path, content) {
+  mkdirSync(dirname(path), {
+    recursive: true
+  });
+  writeFileSync(path, content);
+}
+function buildPackageJSON(name) {
+  return `${JSON.stringify(
+    {
+      name,
+      private: true,
+      type: "module",
+      version: "1.0.0",
+      scripts: {
+        dev: "vite",
+        build: "vite build",
+        start: "node server.ts",
+        check: "tsc --noEmit && biome check .",
+        test: "vitest run"
+      },
+      dependencies: {
+        "@faasjs/func": "*",
+        "@faasjs/http": "*",
+        faasjs: "*",
+        react: "*",
+        "react-dom": "*",
+        zod: "*"
+      },
+      devDependencies: {
+        "@biomejs/biome": "*",
+        "@faasjs/dev": "*",
+        "@faasjs/lint": "*",
+        "@types/node": "*",
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "@vitejs/plugin-react": "*",
+        jsdom: "*",
+        typescript: "*",
+        vite: "*",
+        vitest: "*"
+      }
+    },
+    null,
+    2
+  )}
+`;
+}
+function scaffold(rootPath) {
+  writeFile(
+    join(rootPath, ".gitignore"),
+    `node_modules/
+dist/
+coverage/
 `
   );
-  writeFileSync(
-    join(answers.name, "package.json"),
+  writeFile(
+    join(rootPath, "biome.json"),
     `{
-  "name": "${answers.name}",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "serve": "faas server",
-    "test": "vitest run"
-  },
-  "dependencies": {
-    "faasjs": "*"
-  },
-  "devDependencies": {
-    "vitest": "*"
-  }
-}`
+  "extends": ["@faasjs/lint/biome"]
+}
+`
   );
-  writeFileSync(
-    join(answers.name, "tsconfig.json"),
+  writeFile(
+    join(rootPath, "tsconfig.json"),
     `{
   "compilerOptions": {
-    "downlevelIteration": true,
-    "esModuleInterop": true,
-    "target": "ES2019",
+    "target": "ES2022",
     "module": "ESNext",
-    "moduleResolution": "node",
-    "baseUrl": "."
-  }
+    "moduleResolution": "Bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "types": ["vitest/globals"]
+  },
+  "include": ["src", "vite.config.ts", "server.ts"]
 }
 `
   );
-  writeFileSync(
-    join(answers.name, ".gitignore"),
-    `node_modules/
-tmp/
-coverage/
-*.tmp.js
+  writeFile(
+    join(rootPath, "index.html"),
+    `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>FaasJS App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
 `
   );
-  mkdirSync(join(answers.name, ".vscode"));
-  writeFileSync(
-    join(answers.name, ".vscode", "settings.json"),
-    `{
-  "editor.detectIndentation": true,
-  "editor.insertSpaces": true,
-  "editor.tabSize": 2,
-  "editor.codeActionsOnSave": {
-    "source.fixAll": true
+  writeFile(
+    join(rootPath, "vite.config.ts"),
+    `import { viteFaasJsServer } from '@faasjs/dev'
+import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite'
+export default defineConfig({
+  server: {
+    host: '0.0.0.0',
   },
-  "editor.wordWrap": "on",
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true
-}
+  plugins: [react(), viteFaasJsServer()],
+})
 `
   );
-  writeFileSync(
-    join(answers.name, ".vscode", "extensions.json"),
-    `{
-  "recommendations": [
-    "faasjs.faasjs-snippets"
-  ]
+  writeFile(
+    join(rootPath, "server.ts"),
+    `import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { Server, staticHandler } from '@faasjs/server'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+const publicHandler = staticHandler({
+  root: join(__dirname, 'public'),
+  notFound: false,
+})
+const distHandler = staticHandler({
+  root: join(__dirname, 'dist'),
+  notFound: 'index.html',
+})
+new Server(join(__dirname, 'src'), {
+  beforeHandle: async (req, res, ctx) => {
+    if (!req.url || req.method !== 'GET') return
+    await publicHandler(req, res, ctx)
+    await distHandler(req, res, ctx)
+  },
+}).listen()
+`
+  );
+  writeFile(
+    join(rootPath, "src", "faas.yaml"),
+    `defaults:
+  plugins:
+    http:
+      config:
+        cookie:
+          secure: false
+          session:
+            secret: secret
+development:
+testing:
+production:
+`
+  );
+  writeFile(
+    join(rootPath, "src", "main.tsx"),
+    `import { createRoot } from 'react-dom/client'
+import HomePage from './pages/home'
+createRoot(document.getElementById('root') as HTMLElement).render(<HomePage />)
+`
+  );
+  writeFile(
+    join(rootPath, "src", "pages", "home", "index.tsx"),
+    `import { useState } from 'react'
+type ApiResponse = {
+  ok: boolean
+  data: string
+  error: null | {
+    code?: string
+    message: string
+  }
+}
+export default function HomePage() {
+  const [message, setMessage] = useState('Click button to call API')
+  const [loading, setLoading] = useState(false)
+  const fetchMessage = async () => {
+    setLoading(true)
+    try {
+      const data = await fetch('/home/api/hello', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ name: 'world' }),
+      }).then(res => res.json() as Promise<ApiResponse>)
+      if (data.ok) setMessage(data.data)
+      else setMessage(data.error?.message || 'Unknown error')
+    } catch (error: any) {
+      setMessage(error?.message || 'Unknown error')
+    } finally {
+      setLoading(false)
+    }
+  }
+  return (
+    <main style={{ margin: '5rem auto', maxWidth: 420, padding: 24 }}>
+      <h1>FaasJS Starter</h1>
+      <p>{message}</p>
+      <button type="button" onClick={fetchMessage} disabled={loading}>
+        {loading ? 'Loading...' : 'Call /home/api/hello'}
+      </button>
+    </main>
+  )
 }
 `
   );
-  execSync(`cd ${answers.name} && ${runtime} install`, { stdio: "inherit" });
-  writeFileSync(
-    join(answers.name, "index.func.ts"),
-    `import { useFunc } from '@faasjs/func'
-import { useHttp } from '@faasjs/http'
+  writeFile(
+    join(rootPath, "src", "pages", "home", "api", "hello.func.ts"),
+    `import { defineFunc } from '@faasjs/func'
+import { z } from 'zod'
-export const func = useFunc(() => {
-  const http = useHttp<{ name: string }>()
+const schema = z
+  .object({
+    name: z.string().optional(),
+  })
+  .required()
-  return async () => \`Hello, \${http.params.name}\`
-})
+export const func = defineFunc<{ params?: z.infer<typeof schema> }>(
+  async ({ event }) => {
+    const parsed = schema.parse(event.params || {})
+    return {
+      ok: true,
+      data: \`Hello, \${parsed.name || 'FaasJS'}\`,
+      error: null,
+    }
+  }
+)
 `
   );
-  mkdirSync(join(answers.name, "__tests__"));
-  writeFileSync(
-    join(answers.name, "__tests__", "index.test.ts"),
-    `import { test } from '@faasjs/test'
-import { func } from '../index.func'
+  writeFile(
+    join(rootPath, "src", "pages", "home", "api", "__tests__", "hello.test.ts"),
+    `import { test } from '@faasjs/dev'
+import { func } from '../hello.func'
-describe('hello', () => {
+describe('home/api/hello', () => {
   it('should work', async () => {
     const testFunc = test(func)
-    const { statusCode, data } = await testFunc.JSONhandler<string>({ name: 'world' })
+    const { statusCode, data } = await testFunc.JSONhandler({ name: 'world' })
     expect(statusCode).toEqual(200)
-    expect(data).toEqual('Hello, world')
+    expect(data).toEqual({
+      ok: true,
+      data: 'Hello, world',
+      error: null,
+    })
   })
 })
 `
   );
+}
+async function action(options = {}) {
+  const answers = Object.assign(options, {});
+  if (!options.name || Validator.name(options.name) !== true)
+    answers.name = await prompt({
+      type: "input",
+      name: "value",
+      message: "Project name",
+      initial: "faasjs",
+      validate: Validator.name
+    }).then((res) => res.value);
+  if (!answers.name) return;
+  const runtime = process.versions.bun ? "bun" : "npm";
+  mkdirSync(answers.name);
+  writeFileSync(
+    join(answers.name, "package.json"),
+    buildPackageJSON(answers.name)
+  );
+  scaffold(answers.name);
+  execSync(`cd ${answers.name} && ${runtime} install`, { stdio: "inherit" });
   if (runtime === "bun") {
     execSync(`cd ${answers.name} && bun test`, { stdio: "inherit" });
   } else execSync(`cd ${answers.name} && npm run test`, { stdio: "inherit" });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "create-faas-app",
-  "version": "v8.0.0-beta.3",
+  "version": "v8.0.0-beta.5",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.cjs",