@dbos-inc/create 1.3.9-preview → 1.3.12-preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbos-inc/create",
-  "version": "1.3.9-preview",
+  "version": "1.3.12-preview",
   "description": "Tool for performing project initialization from template",
   "license": "MIT",
   "type": "module",

package/templates/hello/dbos-config.yaml

@@ -4,12 +4,14 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/dbos-inc/dbos-sdk/main/dbos-config.schema.json
 
 database:
-  hostname: 'localhost'
+  hostname: localhost
   port: 5432
-  username: 'postgres'
+  username: postgres
   password: ${PGPASSWORD}
-  app_db_name: 'hello'
+  app_db_name: hello
   connectionTimeoutMillis: 3000
-  app_db_client: 'knex'
-  migrate: ['npx knex migrate:latest']
-  rollback: ['npx knex migrate:rollback']
+  app_db_client: knex
+  migrate:
+    - npx knex migrate:latest
+  rollback:
+    - npx knex migrate:rollback

package/templates/hello/knexfile.js

@@ -7,6 +7,7 @@ const config = {
   client: 'pg',
   connection: {
     host: dbosConfig.poolConfig.host,
+    port: dbosConfig.poolConfig.port,
     user: dbosConfig.poolConfig.user,
     password: dbosConfig.poolConfig.password,
     database: dbosConfig.poolConfig.database,

package/templates/hello/package-lock.json

@@ -45,13 +45,14 @@
         "axios": "1.6.7",
         "commander": "12.0.0",
         "fast-glob": "3.3.2",
+        "inquirer": "^8.2.6",
         "kafkajs": "^2.2.4",
         "knex": "3.1.0",
         "koa": "2.15.0",
         "lodash": "4.17.21",
         "openapi-types": "12.1.3",
         "pg": "8.11.3",
-        "reflect-metadata": "0.2.1",
+        "reflect-metadata": "0.2.2",
         "serialize-error": "8.1.0",
         "uuid": "9.0.1",
         "validator": "13.11.0",
@@ -65,6 +66,7 @@
       },
       "devDependencies": {
         "@prisma/client": "^5.3.1",
+        "@types/inquirer": "^8.2.10",
         "@types/koa": "^2.15.0",
         "@types/koa__cors": "^5.0.0",
         "@types/koa__router": "^12.0.4",

package/templates/hello/start_postgres_docker.js

@@ -0,0 +1,40 @@
+const { execSync } = require('child_process');
+
+// Default PostgreSQL port
+let port = '5432';
+
+// Set the host PostgreSQL port with the -p/--port flag.
+process.argv.forEach((val, index) => {
+  if (val === '-p' || val === '--port') {
+    if (process.argv[index + 1]) {
+      port = process.argv[index + 1];
+    }
+  }
+});
+
+if (!process.env.PGPASSWORD) {
+  console.error("Error: PGPASSWORD is not set.");
+  process.exit(1);
+}
+
+try {
+  execSync(`docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD="${process.env.PGPASSWORD}" --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p ${port}:5432 -d postgres:16.1`);
+  console.log("Waiting for PostgreSQL to start...");
+
+  let attempts = 30;
+  const checkDatabase = setInterval(() => {
+    try {
+      execSync('docker exec dbos-db psql -U postgres -c "SELECT 1;"', { stdio: 'ignore' });
+      console.log("PostgreSQL started!");
+      clearInterval(checkDatabase);
+      console.log("Database started successfully!");
+    } catch (error) {
+      if (--attempts === 0) {
+        clearInterval(checkDatabase);
+        console.error("Failed to start PostgreSQL.");
+      }
+    }
+  }, 1000);
+} catch (error) {
+  console.error("Error starting PostgreSQL in Docker:", error.message);
+}

package/templates/hello/start_postgres_docker.bat

@@ -1,36 +0,0 @@
-@echo off
-
-setlocal ENABLEEXTENSIONS
-
-echo Checking if PGPASSWORD is set.
-if "%PGPASSWORD%"=="" (
-  echo Error: PGPASSWORD is not set.
-  exit /b 1
-)
-
-echo Starting PostgreSQL in a local Docker container
-docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD=%PGPASSWORD% --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p 5432:5432 -d postgres:16.1
-
-	if %errorlevel% == 125 (
-		echo Error: Check if the Docker container already exists
-		exit /b 1
-		) else (
-		goto :start
-		)
-
-:start
-echo Waiting for PostgreSQL to start...
-for /l %%i in (1,1,30) do (
-  docker exec dbos-db psql -U postgres -c "SELECT 1;" >NUL 2>&1
-
-if %errorlevel% equ 0 (
-(
-    echo PostgreSQL started!
-    goto :break
-  )
-  timeout /t 1 /nobreak
-)
-  )
-:break
-
-echo Database started successfully^!

package/templates/hello/start_postgres_docker.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-# Check if PGPASSWORD is set
-if [[ -z "${PGPASSWORD}" ]]; then
-  echo "Error: PGPASSWORD is not set." >&2
-  exit 1
-fi
-
-# Start Postgres in a local Docker container
-docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD=${PGPASSWORD} --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p 5432:5432 -d postgres:16.1
-
-# Wait for PostgreSQL to start
-echo "Waiting for PostgreSQL to start..."
-for i in {1..30}; do
-  if docker exec dbos-db psql -U postgres -c "SELECT 1;" > /dev/null 2>&1; then
-    echo "PostgreSQL started!"
-    break
-  fi
-  sleep 1
-done
-
-echo "Database started successfully!"