@fedify/init 2.0.6-pr.633.9 → 2.0.7-dev.573

package/README.md

@@ -25,10 +25,10 @@ Supported options
 
 The initializer supports the following project configurations:
 
- -  **Web frameworks**: [Hono], [Nitro], [Next.js], [Elysia], [Express]
+ -  **Web frameworks**: Bare-bones, [Hono], [Nitro], [Next.js], [Elysia], [Express]
  -  **Package managers**: Deno, pnpm, Bun, Yarn, npm
- -  **Key-value stores**: Deno KV, Redis, PostgreSQL
- -  **Message queues**: Deno KV, Redis, PostgreSQL, AMQP
+ -  **Key-value stores**: In-Memory, Deno KV, Redis, PostgreSQL
+ -  **Message queues**: In-Process, Deno KV, Redis, PostgreSQL, AMQP
 
 [Hono]: https://hono.dev/
 [Nitro]: https://nitro.build/

package/dist/command.d.ts

@@ -4,25 +4,25 @@ import { InferValue } from "@optique/core";
 //#region src/command.d.ts
 declare const initOptions: _optique_core0.Parser<"sync", {
   readonly dir: string;
-  readonly webFramework: "hono" | "nitro" | "next" | "elysia" | "express";
+  readonly webFramework: "bare-bones" | "hono" | "nitro" | "next" | "elysia" | "express";
   readonly packageManager: "deno" | "pnpm" | "bun" | "yarn" | "npm";
-  readonly kvStore: "denokv" | "redis" | "postgres";
-  readonly messageQueue: "denokv" | "redis" | "postgres" | "amqp";
+  readonly kvStore: "postgres" | "in-memory" | "redis" | "denokv";
+  readonly messageQueue: "postgres" | "redis" | "denokv" | "in-process" | "amqp";
   readonly dryRun: boolean;
 }, {
   readonly dir: [_optique_core0.ValueParserResult<string>];
-  readonly webFramework: [_optique_core0.ValueParserResult<"hono" | "nitro" | "next" | "elysia" | "express">];
+  readonly webFramework: [_optique_core0.ValueParserResult<"bare-bones" | "hono" | "nitro" | "next" | "elysia" | "express">];
   readonly packageManager: [_optique_core0.ValueParserResult<"deno" | "pnpm" | "bun" | "yarn" | "npm">];
-  readonly kvStore: [_optique_core0.ValueParserResult<"denokv" | "redis" | "postgres">];
-  readonly messageQueue: [_optique_core0.ValueParserResult<"denokv" | "redis" | "postgres" | "amqp">];
+  readonly kvStore: [_optique_core0.ValueParserResult<"postgres" | "in-memory" | "redis" | "denokv">];
+  readonly messageQueue: [_optique_core0.ValueParserResult<"postgres" | "redis" | "denokv" | "in-process" | "amqp">];
   readonly dryRun: _optique_core0.ValueParserResult<boolean>;
 }>;
 declare const initCommand: _optique_core0.Parser<"sync", {
   readonly dir: string;
-  readonly webFramework: "hono" | "nitro" | "next" | "elysia" | "express";
+  readonly webFramework: "bare-bones" | "hono" | "nitro" | "next" | "elysia" | "express";
   readonly packageManager: "deno" | "pnpm" | "bun" | "yarn" | "npm";
-  readonly kvStore: "denokv" | "redis" | "postgres";
-  readonly messageQueue: "denokv" | "redis" | "postgres" | "amqp";
+  readonly kvStore: "postgres" | "in-memory" | "redis" | "denokv";
+  readonly messageQueue: "postgres" | "redis" | "denokv" | "in-process" | "amqp";
   readonly dryRun: boolean;
 } & {
   readonly command: "init";

package/dist/const.d.ts

@@ -1,4 +1,6 @@
 //#region src/const.d.ts
+
+/** All supported package manager identifiers, in display order. */
 declare const PACKAGE_MANAGER: readonly ["deno", "pnpm", "bun", "yarn", "npm"];
 //#endregion
 export { PACKAGE_MANAGER };

package/dist/const.js

@@ -1,4 +1,8 @@
+import kv_default from "./json/kv.js";
+import mq_default from "./json/mq.js";
+
 //#region src/const.ts
+/** All supported package manager identifiers, in display order. */
 const PACKAGE_MANAGER = [
 	"deno",
 	"pnpm",
@@ -7,23 +11,17 @@ const PACKAGE_MANAGER = [
 	"npm"
 ];
 const WEB_FRAMEWORK = [
+	"bare-bones",
 	"hono",
 	"nitro",
 	"next",
 	"elysia",
 	"express"
 ];
-const MESSAGE_QUEUE = [
-	"denokv",
-	"redis",
-	"postgres",
-	"amqp"
-];
-const KV_STORE = [
-	"denokv",
-	"redis",
-	"postgres"
-];
+/** All supported message queue backend identifiers. */
+const MESSAGE_QUEUE = Object.keys(mq_default);
+/** All supported key-value store backend identifiers. */
+const KV_STORE = Object.keys(kv_default);
 const DB_TO_CHECK = [
 	"redis",
 	"postgres",

package/dist/deno.js

@@ -1,6 +1,6 @@
 //#region deno.json
 var name = "@fedify/init";
-var version = "2.0.6-pr.633.9+12093e72";
+var version = "2.0.7-dev.573+8bbfb513";
 var license = "MIT";
 var exports = "./src/mod.ts";
 var imports = {

package/dist/json/kv.js

@@ -1,4 +1,16 @@
 //#region src/json/kv.json
+var in_memory = {
+	"label": "In-Memory",
+	"packageManagers": [
+		"deno",
+		"bun",
+		"npm",
+		"yarn",
+		"pnpm"
+	],
+	"imports": { "@fedify/fedify": { "MemoryKvStore": "MemoryKvStore" } },
+	"object": "new MemoryKvStore()"
+};
 var redis = {
 	"label": "Redis",
 	"packageManagers": [
@@ -41,6 +53,7 @@ var denokv = {
 	"denoUnstable": ["kv"]
 };
 var kv_default = {
+	"in-memory": in_memory,
 	redis,
 	postgres,
 	denokv

package/dist/json/kv.json

@@ -1,4 +1,12 @@
 {
+  "in-memory": {
+    "label": "In-Memory",
+    "packageManagers": ["deno", "bun", "npm", "yarn", "pnpm"],
+    "imports": {
+      "@fedify/fedify": { "MemoryKvStore": "MemoryKvStore" }
+    },
+    "object": "new MemoryKvStore()"
+  },
   "redis": {
     "label": "Redis",
     "packageManagers": ["deno", "bun", "npm", "yarn", "pnpm"],

package/dist/json/mq.js

@@ -1,4 +1,16 @@
 //#region src/json/mq.json
+var in_process = {
+	"label": "In-Process",
+	"packageManagers": [
+		"deno",
+		"bun",
+		"npm",
+		"yarn",
+		"pnpm"
+	],
+	"imports": { "@fedify/fedify": { "InProcessMessageQueue": "InProcessMessageQueue" } },
+	"object": "new InProcessMessageQueue()"
+};
 var redis = {
 	"label": "Redis",
 	"packageManagers": [
@@ -59,6 +71,7 @@ var denokv = {
 	"denoUnstable": ["kv"]
 };
 var mq_default = {
+	"in-process": in_process,
 	redis,
 	postgres,
 	amqp,

package/dist/json/mq.json

@@ -1,4 +1,20 @@
 {
+  "in-process": {
+    "label": "In-Process",
+    "packageManagers": [
+      "deno",
+      "bun",
+      "npm",
+      "yarn",
+      "pnpm"
+    ],
+    "imports": {
+      "@fedify/fedify": {
+        "InProcessMessageQueue": "InProcessMessageQueue"
+      }
+    },
+    "object": "new InProcessMessageQueue()"
+  },
   "redis": {
     "label": "Redis",
     "packageManagers": [

package/dist/lib.js

@@ -20,7 +20,12 @@ const logger = getLogger([
 	"cli",
 	"init"
 ]);
-const addFedifyDeps = (json) => Object.fromEntries(Object.entries(json).map(([key, value]) => [key, toMerged(value, { dependencies: { [`@fedify/${key}`]: PACKAGE_VERSION } })]));
+const addFedifyDeps = (json) => Object.fromEntries(Object.entries(json).map(([key, value]) => [key, toMerged(value, { dependencies: { ...NO_INTEGRATIONS.includes(key) ? {} : { [`@fedify/${key}`]: PACKAGE_VERSION } } })]));
+const NO_INTEGRATIONS = [
+	"in-memory",
+	"in-process",
+	"bare-bones"
+];
 const kvStores = addFedifyDeps(kv_default);
 const messageQueues = addFedifyDeps(mq_default);
 const toRegExp = (str) => new RegExp(str);

package/dist/templates/bare-bones/main/bun.ts.tpl

@@ -0,0 +1,16 @@
+import { behindProxy } from "x-forwarded-fetch";
+import federation from "./federation.ts";
+import "./logging.ts";
+
+const server = Bun.serve({
+  port: 8000,
+  fetch: behindProxy((req) =>
+    new URL(req.url).pathname === "/"
+      ? new Response("Hello, this is a Fedify server!", {
+        headers: { "Content-Type": "text/plain" },
+      })
+      : federation.fetch(req, { contextData: undefined })
+  ),
+});
+
+console.log("Server started at", server.url.href);

package/dist/templates/bare-bones/main/deno.ts.tpl

@@ -0,0 +1,19 @@
+import "@std/dotenv/load";
+import { behindProxy } from "@hongminhee/x-forwarded-fetch";
+import federation from "./federation.ts";
+import "./logging.ts";
+
+Deno.serve(
+  {
+    port: 8000,
+    onListen: ({ port, hostname }) =>
+      console.log("Server started at http://" + hostname + ":" + port)
+  },
+  behindProxy((req) =>
+    new URL(req.url).pathname === "/"
+      ? new Response("Hello, this is a Fedify server!", {
+        headers: { "Content-Type": "text/plain" },
+      })
+      : federation.fetch(req, { contextData: undefined })
+  ),
+);

package/dist/templates/bare-bones/main/node.ts.tpl

@@ -0,0 +1,19 @@
+import { serve } from "@hono/node-server";
+import { behindProxy } from "x-forwarded-fetch";
+import federation from "./federation.ts";
+import "./logging.ts";
+
+serve(
+  {
+    port: 8000,
+    fetch: behindProxy((req) =>
+    new URL(req.url).pathname === "/"
+      ? new Response("Hello, this is a Fedify server!", {
+        headers: { "Content-Type": "text/plain" },
+      })
+      : federation.fetch(req, { contextData: undefined })
+  ),
+  },
+  (info) =>
+    console.log("Server started at http://" + info.address + ":" + info.port)
+);

package/dist/test/lookup.js

@@ -53,7 +53,7 @@ async function testApp(dir) {
 		kv,
 		mq
 	])}...`;
-	const result = await serverClosure(dir, getDevCommand(pm), sendLookup);
+	const result = await serverClosure(dir, getDevCommand(pm), webframeworks_default[wf].defaultPort, sendLookup);
 	printMessage`    Lookup ${result ? "successful" : "failed"} for ${values([
 		wf,
 		pm,
@@ -105,7 +105,7 @@ async function waitForServer(url, timeout) {
 	}
 	return false;
 }
-async function serverClosure(dir, cmd, callback) {
+async function serverClosure(dir, cmd, defaultPort, callback) {
 	const devCommand = cmd.split(" ");
 	const serverProcess = spawn(devCommand[0], devCommand.slice(1), {
 		cwd: dir,
@@ -121,7 +121,11 @@ async function serverClosure(dir, cmd, callback) {
 	serverProcess.stdout?.pipe(stdout);
 	serverProcess.stderr?.pipe(stderr);
 	try {
-		const port = await determinePort(serverProcess);
+		const port = await determinePort(serverProcess).catch((err) => {
+			printErrorMessage`Failed to determine server port: ${err.message}`;
+			printErrorMessage`Use default port ${String(defaultPort)} for lookup.`;
+			return defaultPort;
+		});
 		return await callback(port);
 	} finally {
 		try {

package/dist/webframeworks.js

@@ -5,6 +5,51 @@ import { pipe } from "@fxts/core";
 
 //#region src/webframeworks.ts
 const webFrameworks = {
+	"bare-bones": {
+		label: "Bare-bones",
+		packageManagers: PACKAGE_MANAGER,
+		defaultPort: 8e3,
+		init: async ({ packageManager: pm }) => ({
+			dependencies: pm === "deno" ? {
+				...defaultDenoDependencies,
+				"@std/dotenv": "^0.225.2",
+				"@hongminhee/x-forwarded-fetch": "^0.2.0"
+			} : pm === "bun" ? { "npm:x-forwarded-fetch": "^0.2.0" } : {
+				"npm:@dotenvx/dotenvx": "^1.14.1",
+				"npm:@hono/node-server": "^1.12.0",
+				"npm:tsx": "^4.17.0",
+				"npm:x-forwarded-fetch": "^0.2.0"
+			},
+			devDependencies: {
+				...defaultDevDependencies,
+				...pm === "bun" ? { "@types/bun": "^1.1.6" } : { "@types/node": "^18.0.0" }
+			},
+			federationFile: "src/federation.ts",
+			loggingFile: "src/logging.ts",
+			files: {
+				"src/main.ts": await readTemplate(`bare-bones/main/${packageManagerToRuntime(pm)}.ts`),
+				...pm !== "deno" ? { "eslint.config.ts": await readTemplate("defaults/eslint.config.ts") } : {}
+			},
+			compilerOptions: pm === "deno" ? {
+				"jsx": "precompile",
+				"jsxImportSource": "hono/jsx"
+			} : {
+				"lib": ["ESNext", "DOM"],
+				"target": "ESNext",
+				"module": "NodeNext",
+				"moduleResolution": "NodeNext",
+				"allowImportingTsExtensions": true,
+				"verbatimModuleSyntax": true,
+				"noEmit": true,
+				"strict": true
+			},
+			tasks: {
+				"dev": pm === "deno" ? "deno run -A --watch ./src/main.ts" : pm === "bun" ? "bun run --hot ./src/main.ts" : "dotenvx run -- tsx watch ./src/main.ts",
+				"prod": pm === "deno" ? "deno run -A ./src/main.ts" : pm === "bun" ? "bun run ./src/main.ts" : "dotenvx run -- node --import tsx ./src/main.ts"
+			},
+			instruction: getInstruction(pm, 8e3)
+		})
+	},
 	hono: {
 		label: "Hono",
 		packageManagers: PACKAGE_MANAGER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/init",
-  "version": "2.0.6-pr.633.9+12093e72",
+  "version": "2.0.7-dev.573+8bbfb513",
   "description": "Project initializer for Fedify",
   "keywords": [
     "fedify",