@notation/cli 0.5.0 → 0.6.1

package/dist/index.js

@@ -17,7 +17,7 @@ async function compile(entryPoint, watch2 = false) {
   log(`${watch2 ? "Watching" : "Compiling"} infrastructure`, entryPoint);
   await compileInfra(entryPoint, watch2);
   log(`${watch2 ? "Watching" : "Compiling"} functions`);
-  const fnEntryPoints = await glob("**/*.fn.ts");
+  const fnEntryPoints = await glob("runtime/**/*.fn.ts");
   let disposeFnCompiler = await compileFns(fnEntryPoints, watch2);
   if (!watch2)
     return;
@@ -27,7 +27,7 @@ async function compile(entryPoint, watch2 = false) {
   }).on("all", async () => {
     if (disposeFnCompiler)
       disposeFnCompiler();
-    const fnEntryPoints2 = await glob("**/*.fn.ts");
+    const fnEntryPoints2 = await glob("runtime/**/*.fn.ts");
     disposeFnCompiler = await compileFns(fnEntryPoints2, watch2);
   });
 }
@@ -35,7 +35,7 @@ async function compileInfra(entryPoint, watch2 = false) {
   const context = await esbuild.context({
     entryPoints: [entryPoint],
     plugins: [functionInfraPlugin()],
-    outdir: "dist/infra",
+    outdir: "dist",
     outbase: ".",
     outExtension: { ".js": ".mjs" },
     bundle: true,
@@ -150,80 +150,13 @@ async function watch(entryPoint) {
   }
 }
 
-// src/scaffold.ts
-import path from "node:path";
-import fse from "fs-extra";
-import { execSync } from "node:child_process";
-import whichPmRuns from "which-pm-runs";
-var dirname = path.dirname(new URL(import.meta.url).pathname);
-var packageManager = whichPmRuns()?.name || "npm";
-var packageManagerInstallCommand = getPmInstallCommand(packageManager);
-async function scaffoldApp(appName) {
-  const cwd = process.cwd();
-  const appDir = path.join(cwd, appName);
-  await fse.ensureDir(appDir);
-  const children = await fse.readdir(appDir);
-  if (children.length) {
-    console.error(
-      `Directory ${path.relative(process.cwd(), appDir)} is not empty`
-    );
-    return;
-  }
-  console.log(`
-Creating app from template...`);
-  const templateDir = path.join(dirname, "../templates/starter");
-  await fse.copy(templateDir, appDir);
-  const packageJsonPath = path.join(appDir, "package.json");
-  const packageJsonContent = await fse.readFile(packageJsonPath, "utf8");
-  const packageJson = JSON.parse(packageJsonContent);
-  packageJson.name = appName;
-  const updatedPackageJson = JSON.stringify(packageJson, null, 2);
-  await fse.writeFile(packageJsonPath, updatedPackageJson, {
-    encoding: "utf8"
-  });
-  console.log(`Installing dependencies with ${packageManager}...`);
-  execSync(`${packageManagerInstallCommand} @notation/cli @notation/aws`, {
-    cwd: appDir,
-    stdio: "inherit"
-  });
-  console.log("\nApp ready! To get started run:\n");
-  console.log(`\u279C cd ${appName}`);
-  console.log(`\u279C ${getPmRunCommand(packageManager)} viz`);
-}
-function getPmInstallCommand(pm) {
-  switch (pm) {
-    case "yarn":
-      return "yarn add";
-    case "pnpm":
-      return "pnpm add";
-    case "bun":
-      return "bun add";
-    default:
-      return "npm install";
-  }
-}
-function getPmRunCommand(pm) {
-  switch (pm) {
-    case "yarn":
-      return "yarn";
-    case "pnpm":
-      return "pnpm";
-    case "bun":
-      return "bun";
-    default:
-      return "npm run";
-  }
-}
-
 // src/index.ts
-program.command("create").argument("[appName]", "app name", "notation-starter").description("Create Notation App").action(async (appName) => {
-  await scaffoldApp(appName);
-});
+import { startDashboardServer } from "@notation/dashboard";
 program.command("compile").argument("<entryPoint>", "entryPoint").description("Compile Notation App").action(async (entryPoint) => {
   await compile(entryPoint);
 });
-program.command("viz").argument("<entryPoint>", "entryPoint").description("Visualise Notation App").action(async (entryPoint) => {
-  await visualise(entryPoint);
+program.command("dashboard").description("Start Notation Dashboard").action(async () => {
+  await startDashboardServer();
 });
 program.command("deploy").argument("<entryPoint>", "entryPoint").description("Deploy Notation App").action(async (entryPoint) => {
   await deploy(entryPoint);
@@ -231,6 +164,9 @@ program.command("deploy").argument("<entryPoint>", "entryPoint").description("De
 program.command("destroy").argument("<entryPoint>", "entryPoint").description("Destroy Notation App").action(async (entryPoint) => {
   await destroy(entryPoint);
 });
+program.command("viz").argument("<entryPoint>", "entryPoint").description("Visualise Notation App").action(async (entryPoint) => {
+  await visualise(entryPoint);
+});
 program.command("watch").argument("<entryPoint>", "entryPoint").description("Watch Notation App").action(async (entryPoint) => {
   await watch(entryPoint);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@notation/cli",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "files": [
     "dist",
     "templates"
@@ -13,18 +13,16 @@
     "chokidar": "^3.5.3",
     "commander": "^11.0.0",
     "esbuild": "^0.19.3",
-    "fs-extra": "^11.1.1",
     "glob": "^10.3.10",
-    "which-pm-runs": "^1.1.0",
-    "@notation/core": "0.4.0",
-    "@notation/esbuild-plugins": "0.3.2"
+    "@notation/core": "0.5.0",
+    "@notation/esbuild-plugins": "0.4.1",
+    "@notation/dashboard": "0.2.0"
   },
   "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
     "@types/which-pm-runs": "^1.0.2"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "npm run build -- --watch"
+    "build": "tsup --clean",
+    "dev": "tsup --watch"
   }
 }

package/templates/starter/package.json

@@ -1,9 +0,0 @@
-{
-  "private": true,
-  "name": "notation-starter",
-  "scripts": {
-    "viz": "notation viz src/api.ts",
-    "deploy": "notation deploy src/api.ts",
-    "destroy": "notation destroy src/api.ts"
-  }
-}

package/templates/starter/src/api.ts

@@ -1,8 +0,0 @@
-import { api, router } from "@notation/aws/api-gateway";
-import { getTodos, getTodoCount } from "./todos/todos.fn";
-
-const todoApi = api({ name: "todo-api" });
-const todoRouter = router(todoApi);
-
-todoRouter.get("/todos", getTodos);
-todoRouter.get("/todos/count", getTodoCount);

package/templates/starter/src/todos/todos.fn.ts

@@ -1,19 +0,0 @@
-import type { LambdaConfig } from "@notation/aws/lambda.fn";
-import { handle, json } from "@notation/aws/lambda.fn";
-import { api } from "./utils";
-
-const todos = await api.get<any[]>("/todos");
-
-export const getTodos = handle.apiRequest(() => {
-  return json(todos);
-});
-
-export const getTodoCount = handle.apiRequest(() => {
-  return json(todos.length);
-});
-
-export const config: LambdaConfig = {
-  service: "aws/lambda",
-  timeout: 5,
-  memory: 64,
-};

package/templates/starter/src/todos/utils.ts

@@ -1,6 +0,0 @@
-export const api = {
-  get: async <T = any>(path: string) => {
-    const res = await fetch(`https://jsonplaceholder.typicode.com${path}`);
-    return res.json() as Promise<T>;
-  },
-};

package/templates/starter/tsconfig.json

@@ -1,27 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "display": "Default",
-  "compilerOptions": {
-    "lib": ["esnext"],
-    "module": "esnext",
-    "target": "esnext",
-
-    "moduleResolution": "bundler",
-    "noEmit": true,
-
-    "composite": false,
-    "declaration": true,
-    "declarationMap": true,
-    "forceConsistentCasingInFileNames": true,
-    "inlineSources": false,
-    "isolatedModules": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "preserveWatchOutput": true,
-    "skipDefaultLibCheck": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "strictNullChecks": true
-  },
-  "exclude": ["node_modules"]
-}