@dbos-inc/create 1.20.4-preview → 1.20.7-preview

package/dist/cli.js

@@ -3,7 +3,7 @@ import { Command } from 'commander';
 import { init } from './init.js';
 import fs from 'fs';
 import path from "path";
-import inquirer from "inquirer";
+import { input } from "@inquirer/prompts";
 const program = new Command();
 ////////////////////////
 /* LOCAL DEVELOPMENT  */
@@ -26,24 +26,16 @@ program
         template = template || 'hello';
     }
     else {
-        const res = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'template',
-                message: 'What is the template to use for the application?',
-                // Providing a default value
-                default: 'hello',
-            },
-            {
-                type: 'input',
-                name: 'appName',
-                message: 'What is the application/directory name to create?',
-                // Providing a default value
-                default: 'dbos-hello-app',
-            },
-        ]);
-        appName = res.appName;
-        template = res.template;
+        appName = await input({
+            message: 'What is the template to use for the application?',
+            // Providing a default value
+            default: 'hello',
+        });
+        template = await input({
+            message: 'What is the application/directory name to create?',
+            // Providing a default value
+            default: 'dbos-hello-app',
+        });
     }
     await init(appName, template);
 })

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,wBAAwB;AACxB,wBAAwB;AACxB,wBAAwB;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAY,CAAC;AAClH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAErC,OAAO;KACJ,WAAW,CAAC,yBAAyB,CAAC;KACtC,MAAM,CAAC,kCAAkC,EAAE,kBAAkB,CAAC;KAC9D,MAAM,CAAC,gCAAgC,EAAE,sCAAsC,CAAC;KAChF,MAAM,CAAC,KAAK,EAAE,OAAgD,EAAE,OAAgB,EAAE,EAAE;IACnF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,EAAC,OAAO,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC;IAClC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACxB,OAAO,GAAG,OAAO,IAAI,gBAAgB,CAAC;QACtC,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC;IACjC,CAAC;SACI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAChC;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,kDAAkD;gBAC3D,4BAA4B;gBAC5B,OAAO,EAAE,OAAO;aACjB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,mDAAmD;gBAC5D,4BAA4B;gBAC5B,OAAO,EAAE,gBAAgB;aAC1B;SACF,CAAwC,CAAC;QAC1C,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QACtB,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC;KACD,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE7B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,wBAAwB;AACxB,wBAAwB;AACxB,wBAAwB;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAY,CAAC;AAClH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAErC,OAAO;KACJ,WAAW,CAAC,yBAAyB,CAAC;KACtC,MAAM,CAAC,kCAAkC,EAAE,kBAAkB,CAAC;KAC9D,MAAM,CAAC,gCAAgC,EAAE,sCAAsC,CAAC;KAChF,MAAM,CAAC,KAAK,EAAE,OAAgD,EAAE,OAAgB,EAAE,EAAE;IACnF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,EAAC,OAAO,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC;IAClC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACxB,OAAO,GAAG,OAAO,IAAI,gBAAgB,CAAC;QACtC,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC;IACjC,CAAC;SACI,CAAC;QACJ,OAAO,GAAG,MAAM,KAAK,CACnB;YACE,OAAO,EAAE,kDAAkD;YAC3D,4BAA4B;YAC5B,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QACL,QAAQ,GAAG,MAAM,KAAK,CACpB;YACE,OAAO,EAAE,mDAAmD;YAC5D,4BAA4B;YAC5B,OAAO,EAAE,gBAAgB;SAC1B,CAAC,CAAC;IACP,CAAC;IACD,MAAM,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC;KACD,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE7B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbos-inc/create",
-  "version": "1.20.4-preview",
+  "version": "1.20.7-preview",
   "description": "Tool for performing project initialization from template",
   "license": "MIT",
   "type": "module",
@@ -18,7 +18,6 @@
     "create": "./dist/cli.js"
   },
   "devDependencies": {
-    "@types/inquirer": "^9.0.7",
     "@types/node": "^20.6.3",
     "@types/prompt-sync": "^4.2.3",
     "@types/update-notifier": "^6.0.8",
@@ -26,11 +25,11 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
+    "@inquirer/prompts": "^5.3.8",
     "axios": "^1.6.7",
     "chalk": "4.1.2",
     "commander": "^12.0.0",
     "fast-glob": "^3.3.2",
-    "inquirer": "^9.2.16",
     "open": "^10.1.0",
     "prompt-sync": "^4.2.0",
     "update-notifier": "^7.0.0",

package/templates/hello/README.md

@@ -1,6 +1,6 @@
 # DBOS Hello
 
-This is a [DBOS app](https://docs.dbos.dev/) bootstrapped with `npx @dbos-inc/create`.
+This is a [DBOS app](https://docs.dbos.dev/) bootstrapped with `npx @dbos-inc/create` and using [Knex](https://docs.dbos.dev/tutorials/using-knex).
 
 ## Getting Started
 

package/templates/hello/src/operations.ts

@@ -11,13 +11,13 @@ export class Hello {
 
   @GetApi('/') // Serve a quick readme for the app
   static async readme(_ctxt: HandlerContext) {
-    const readme = '<html><body><p>' +
-           'Welcome to the DBOS Hello App!<br><br>' +
-           'Visit the route /greeting/:name to be greeted!<br>' +
-           'For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>' +
-           'The counter increments with each page visit.<br>' +
-           'If you visit a new name like <a href="/greeting/alice">/greeting/alice</a>, the counter starts at 1.' +
-           '</p></body></html>';
+    const readme = `<html><body><p>
+           Welcome to the DBOS Hello App!<br><br>
+           Visit the route /greeting/:name to be greeted!<br>' +
+           For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>
+           The counter increments with each page visit.<br>
+           If you visit a new name like <a href="/greeting/alice">/greeting/alice</a>, the counter starts at 1.
+           </p></body></html>`;
     return Promise.resolve(readme);
   }
 

package/templates/hello-drizzle/README.md

@@ -1,6 +1,6 @@
 # DBOS Hello with Drizzle
 
-This is a [DBOS app](https://docs.dbos.dev/) bootstrapped with `npx @dbos-inc/create`.
+This is a [DBOS app](https://docs.dbos.dev/) bootstrapped with `npx @dbos-inc/create` and using [Drizzle](https://docs.dbos.dev/tutorials/using-drizzle).
 
 ## Getting Started
 

package/templates/hello-drizzle/drizzle/0000_hello.sql

@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS "dbos_hello" (
-	"name" text PRIMARY KEY NOT NULL,
-	"greet_count" integer DEFAULT 0
+	"greet_count" serial PRIMARY KEY NOT NULL,
+	"greeting" text
 );

package/templates/hello-drizzle/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "a4d3c46e-f0ff-439d-8265-f04a053fc603",
+  "id": "78b956ed-8f92-4ee4-aa24-2afbd7e51647",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -8,18 +8,17 @@
       "name": "dbos_hello",
       "schema": "",
       "columns": {
-        "name": {
-          "name": "name",
-          "type": "text",
+        "greet_count": {
+          "name": "greet_count",
+          "type": "serial",
           "primaryKey": true,
           "notNull": true
         },
-        "greet_count": {
-          "name": "greet_count",
-          "type": "integer",
+        "greeting": {
+          "name": "greeting",
+          "type": "text",
           "primaryKey": false,
-          "notNull": false,
-          "default": 0
+          "notNull": false
         }
       },
       "indexes": {},
@@ -36,4 +35,4 @@
     "schemas": {},
     "tables": {}
   }
-}
+}

package/templates/hello-drizzle/drizzle/meta/_journal.json

@@ -5,9 +5,9 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1722903584204,
+      "when": 1722983020785,
       "tag": "0000_hello",
       "breakpoints": true
     }
   ]
-}
+}

package/templates/hello-drizzle/src/operations.test.ts

@@ -18,11 +18,11 @@ describe("operations-test", () => {
    */
   test("test-transaction", async () => {
     const res = await testRuntime.invoke(Hello).helloTransaction("dbos");
-    expect(res).toMatch("Hello, dbos! You have been greeted");
+    expect(res).toMatch("Hello, dbos! We have made");
 
     // Check the greet count.
-    const rows = await testRuntime.queryUserDB("SELECT * FROM dbos_hello WHERE name=$1", "dbos") as {greet_count: number}[];
-    expect(rows[0].greet_count).toBeGreaterThanOrEqual(1);
+    const rows = await testRuntime.queryUserDB("SELECT * FROM dbos_hello WHERE greet_count=1");
+    expect(rows.length).toEqual(1);
   });
 
   /**
@@ -33,6 +33,6 @@ describe("operations-test", () => {
       "/greeting/dbos"
     );
     expect(res.statusCode).toBe(200);
-    expect(res.text).toMatch("Hello, dbos! You have been greeted");
+    expect(res.text).toMatch("Hello, dbos! We have made");
   });
 });

package/templates/hello-drizzle/src/operations.ts

@@ -1,33 +1,25 @@
-import { HandlerContext, TransactionContext, Transaction, GetApi, ArgSource, ArgSources } from '@dbos-inc/dbos-sdk';
-import { DBOSHello } from './schema';
-import { sql } from 'drizzle-orm';
+import { HandlerContext, TransactionContext, Transaction, GetApi } from '@dbos-inc/dbos-sdk';
+import { dbosHello } from './schema';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 
 export class Hello {
 
   @GetApi('/') // Serve a quick readme for the app
   static async readme(_ctxt: HandlerContext) {
-    const readme = '<html><body><p>' +
-           'Welcome to the DBOS Hello App!<br><br>' +
-           'Visit the route /greeting/:name to be greeted!<br>' +
-           'For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>' +
-           'The counter increments with each page visit.<br>' +
-           'If you visit a new name like <a href="/greeting/alice">/greeting/alice</a>, the counter starts at 1.' +
-           '</p></body></html>';
+    const readme = `<html><body><p>
+           Welcome to the DBOS Hello App!<br><br>
+           Visit the route /greeting/:name to be greeted!<br>
+           For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>
+           The counter increments with each page visit.<br>
+           </p></body></html>`;
     return Promise.resolve(readme);
   }
 
-  @GetApi('/greeting/:user') // Serve this function from HTTP GET requests to the /greeting endpoint with 'user' as a path parameter
-  @Transaction()  // Run this function as a database transaction
-  static async helloTransaction(ctxt: TransactionContext<NodePgDatabase>, @ArgSource(ArgSources.URL) user: string) {
-    const output = await ctxt.client.execute(sql`
-      INSERT INTO ${DBOSHello} (name, greet_count)
-      VALUES (${user}, 1)
-      ON CONFLICT (name) DO UPDATE
-      SET greet_count = ${DBOSHello.greet_count} + 1
-      RETURNING greet_count
-    `);
-    const greet_count = output.rows[0].greet_count as number;
-    return `Hello, ${user}! You have been greeted ${greet_count} times.\n`;
+  @GetApi('/greeting/:user')
+  @Transaction()
+  static async helloTransaction(ctxt: TransactionContext<NodePgDatabase>, user: string) {
+    const greeting = `Hello, ${user}!`;
+    const greetings_output = await ctxt.client.insert(dbosHello).values({greeting}).returning({greet_count: dbosHello.greet_count});
+    return `${greeting} We have made ${greetings_output[0].greet_count} greetings.\n`;
   }
 }

package/templates/hello-drizzle/src/schema.ts

@@ -1,7 +1,7 @@
-import { integer } from "drizzle-orm/pg-core";
+import { serial } from "drizzle-orm/pg-core";
 import { pgTable, text } from "drizzle-orm/pg-core";
 
-export const DBOSHello = pgTable('dbos_hello', {
-  name: text('name').primaryKey(),
-  greet_count: integer('greet_count').default(0)
+export const dbosHello = pgTable('dbos_hello', {
+  greet_count: serial('greet_count').primaryKey(),
+  greeting: text('greeting'),
 });

package/templates/hello-prisma/src/operations.ts

@@ -5,12 +5,12 @@ export class Hello {
 
   @GetApi('/') // Serve a quick readme for the app
   static async readme(_ctxt: HandlerContext) {
-    const readme = '<html><body><p>' +
-           'Welcome to the DBOS Hello App!<br><br>' +
-           'Visit the route /greeting/:name to be greeted!<br>' +
-           'For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>' +
-           'The counter increments with each page visit.' +
-           '</p></body></html>';
+    const readme = `<html><body><p>
+          Welcome to the DBOS Hello App!<br><br>
+          Visit the route /greeting/:name to be greeted!<br>
+          For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>
+          The counter increments with each page visit.<br>
+          </p></body></html>`;
     return Promise.resolve(readme);
   }
 

package/templates/hello-typeorm/src/operations.ts

@@ -7,12 +7,12 @@ export class Hello {
 
   @GetApi('/') // Serve a quick readme for the app
   static async readme(_ctxt: HandlerContext) {
-    const readme = '<html><body><p>' +
-           'Welcome to the DBOS Hello App!<br><br>' +
-           'Visit the route /greeting/:name to be greeted!<br>' +
-           'For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>' +
-           'The counter increments with each page visit.' +
-           '</p></body></html>';
+    const readme = `<html><body><p>
+          Welcome to the DBOS Hello App!<br><br>
+          Visit the route /greeting/:name to be greeted!<br>
+          For example, visit <a href="/greeting/dbos">/greeting/dbos</a>.<br>
+          The counter increments with each page visit.<br>
+          </p></body></html>`;
     return Promise.resolve(readme);
   }