create-canton-app 1.5.2 → 2.0.0

package/README.md

@@ -24,8 +24,8 @@ npx create-canton-app
 
 ```bash
 cd my-first-dapp
-daml build
-daml test
+dpm build
+dpm test
 ```
 
 **That's it!** You now have a working Canton smart contract.
@@ -60,30 +60,29 @@ Edit `src/commands/create.js` line 43:
 
 ```javascript
 choices: [
-  { name: 'Bond Trading', value: 'bondtrading' },
+  { name: 'Token Transfer System Template', value: 'TokenTransfer' },
 
-  { name: 'Collateral Master', value: 'collateral' },
+  { name: 'Multi-Party Agreement System Template', value: 'Multiparty' },
 
-  { name: 'My Template', value: 'my-template' }, // ADD THIS
+  { name: 'Asset Holding System Template', value: 'AssetOwner' }
 
-  { name: '📄 Empty Template', value: 'empty' }
+  { name: 'My Template', value: 'my-template' }, // ADD THIS
 ]
 ```
 
 4. Try it
 
 ```bash
-daml build
-daml test
+dpm build
+dpm test
 ```
 
 ## Template Checklist
 
-- [ ] Compiles with `daml build`
-- [ ] Tests pass with `daml test`
+- [ ] Compiles with `dpm build`
+- [ ] Tests pass with `dpm test`
 - [ ] Includes inline comments
 - [ ] Has clear use case
-- [ ] daml.yaml includes `daml-script` dependency
 
 <div align="center">
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-canton-app",
-  "version": "1.5.2",
+  "version": "2.0.0",
   "description": "Scaffold Canton Network/Daml projects in seconds",
   "main": "bin/create-canton-app.js",
   "repository": {

package/src/commands/create.js

@@ -14,13 +14,13 @@ const colors = {
   bold: (text) => `\x1b[1m${text}\x1b[0m`
 };
 
-function isDamlInstalled() {
-  return shell.which('daml') !== null;
+function isDpmInstalled() {
+  return shell.which('dpm') !== null;
 }
 
-function getDamlVersion() {
+function getDpmVersion() {
   try {
-    const result = shell.exec('daml version', { silent: true });
+    const result = shell.exec('dpm version --active', { silent: true });
     const match = result.stdout.match(/(\d+\.\d+\.\d+)/);
     return match ? match[1] : null;
   } catch {
@@ -28,92 +28,161 @@ function getDamlVersion() {
   }
 }
 
-async function installDamlSDK() {
+function getDpmTemplates() {
+  try {
+    const result = shell.exec('dpm new --list', { silent: true });
+    if (result.code !== 0) return [];
+    
+    const lines = result.stdout.split('\n');
+    const templates = [];
+    let inTemplateList = false;
+    
+    for (const line of lines) {
+      if (line.includes('following templates are available')) {
+        inTemplateList = true;
+        continue;
+      }
+      if (inTemplateList && line.trim()) {
+        const templateName = line.trim();
+        if (templateName && !templateName.startsWith('The')) {
+          templates.push(templateName);
+        }
+      }
+    }
+    
+    return templates;
+  } catch {
+    return [];
+  }
+}
+
+async function installDpm() {
   console.log('');
-  console.log(colors.yellow('⚠️  Daml SDK not found!'));
+  console.log(colors.yellow('⚠️ DPM (Digital Asset Package Manager) not found!'));
   console.log('');
-  console.log(colors.white('Daml SDK is required to compile Canton smart contracts.'));
+  console.log(colors.white('DPM is the official Canton development tool.'));
+  console.log(colors.dim('(Replaces the deprecated Daml Assistant)'));
   console.log('');
   
   const answers = await inquirer.prompt([
     {
       type: 'confirm',
-      name: 'installDaml',
-      message: 'Would you like to install Daml SDK now? (Recommended)',
+      name: 'installDpm',
+      message: 'Would you like to install DPM now? (Recommended)',
       default: true
     }
   ]);
 
-  if (!answers.installDaml) {
+  if (!answers.installDpm) {
     console.log('');
-    console.log(colors.yellow('⚠️  Skipping Daml SDK installation.'));
-    console.log(colors.dim('You can install it later with:'));
-    console.log(colors.white('  curl -sSL https://get.daml.com/ | sh'));
+    console.log(colors.yellow('⚠️ Skipping DPM installation.'));
+    console.log(colors.dim('Install manually:'));
+    console.log(colors.white('  curl https://get.digitalasset.com/install/install.sh | sh'));
     console.log('');
     return false;
   }
 
   console.log('');
-  const spinner = ora('Installing Daml SDK (this may take a few minutes)...').start();
+  const spinner = ora('Installing DPM (this may take a few minutes)...').start();
 
   try {
-    const result = shell.exec('curl -sSL https://get.daml.com/ | sh', { silent: true });
+    // FIXED: Use correct installation URL
+    const result = shell.exec('curl -sSL https://get.digitalasset.com/install/install.sh | sh', { 
+      silent: false  // Show output so user can see progress
+    });
 
     if (result.code !== 0) {
-      spinner.fail(colors.red('Failed to install Daml SDK'));
+      spinner.fail(colors.red('Failed to install DPM'));
       console.log('');
-      console.log(colors.yellow('Please install manually:'));
-      console.log(colors.white('  curl -sSL https://get.daml.com/ | sh'));
+      console.log(colors.yellow('Install manually:'));
+      console.log(colors.white('  curl https://get.digitalasset.com/install/install.sh | sh'));
       console.log('');
       return false;
     }
 
-    const damlPath = path.join(process.env.HOME, '.daml', 'bin');
-    process.env.PATH = `${damlPath}:${process.env.PATH}`;
+    // Add to PATH for current session
+    const dpmPath = path.join(process.env.HOME, '.dpm', 'bin');
+    process.env.PATH = `${dpmPath}:${process.env.PATH}`;
 
-    spinner.succeed(colors.green('✨ Daml SDK installed successfully!'));
+    spinner.succeed(colors.green('✨ DPM installed successfully!'));
     
     console.log('');
-    console.log(colors.cyan('📝 Important: Add Daml to your PATH permanently'));
+    console.log(colors.cyan('Important: Add DPM to your PATH permanently'));
     console.log(colors.dim('Add this line to your ~/.zshrc or ~/.bashrc:'));
     console.log('');
-    console.log(colors.white(`  export PATH="$HOME/.daml/bin:$PATH"`));
+    console.log(colors.white(`  export PATH="$HOME/.dpm/bin:$PATH"`));
+    console.log('');
+    console.log(colors.yellow('Then reload your shell:'));
+    console.log(colors.white('  source ~/.zshrc'));
     console.log('');
 
     return true;
   } catch (error) {
     spinner.fail(colors.red('Installation failed: ' + error.message));
+    console.log('');
+    console.log(colors.yellow('Try installing manually:'));
+    console.log(colors.white('  curl https://get.digitalasset.com/install/install.sh | sh'));
+    console.log('');
+    return false;
+  }
+}
+
+async function createFromDpmTemplate(projectName, dpmTemplate) {
+  console.log('');
+  const spinner = ora(`Creating project from DPM template: ${dpmTemplate}...`).start();
+  
+  try {
+    // CORRECT DPM syntax: dpm new --template <template-name> <project-name>
+    const result = shell.exec(`dpm new --template ${dpmTemplate} ${projectName}`, { 
+      silent: false
+    });
+
+    if (result.code !== 0) {
+      spinner.fail(colors.red('Failed to create project'));
+      return false;
+    }
+
+    spinner.succeed(colors.green('Project created successfully!'));
+    return true;
+  } catch (error) {
+    spinner.fail(colors.red('Error: ' + error.message));
     return false;
   }
 }
 
 async function create(projectName, options) {
   try {
-    // Check prerequisites
     console.log('');
     console.log(colors.cyan('🔍 Checking prerequisites...'));
     console.log('');
 
-    if (!isDamlInstalled()) {
-      const installed = await installDamlSDK();
-      if (!installed) {
-        console.log(colors.yellow('⚠️  Continuing without Daml SDK...'));
+    let dpmJustInstalled = false;
+
+    if (!isDpmInstalled()) {
+      const installed = await installDpm();
+      if (installed) {
+        dpmJustInstalled = true;
+        // Give the system a moment to update PATH
+        await new Promise(resolve => setTimeout(resolve, 1000));
+      } else {
+        console.log(colors.yellow('⚠️  Continuing without DPM...'));
+        console.log(colors.dim('You can install it later and use DPM templates.'));
         console.log('');
       }
     } else {
-      const version = getDamlVersion();
-      console.log(colors.green(`✅ Daml SDK found${version ? ` (v${version})` : ''}`));
+      const version = getDpmVersion();
+      console.log(colors.green(`✅ DPM found${version ? ` (v${version})` : ''}`));
     }
 
     if (!shell.which('java')) {
       console.log(colors.yellow('⚠️  Java not found (optional, needed for tests)'));
+      console.log(colors.dim('   Install: brew install openjdk@17'));
     } else {
       console.log(colors.green('✅ Java Runtime found'));
     }
 
     console.log('');
 
-    // Get project name
     if (!projectName) {
       const answers = await inquirer.prompt([
         {
@@ -126,22 +195,97 @@ async function create(projectName, options) {
       projectName = answers.projectName;
     }
 
-    // FIXED: Always ask for template if not explicitly provided via CLI flag
-    let template = options.template;
-    
-    // Check if template was explicitly provided (not just the default)
+    let templateType;
     const wasTemplateProvided = process.argv.includes('--template') || process.argv.includes('-t');
     
+    // Check if DPM is available NOW (after potential installation)
+    const dpmAvailable = isDpmInstalled();
+    
+    if (!wasTemplateProvided) {
+      const choices = [
+        { name: 'Beginner Templates (curated)', value: 'beginner' }
+      ];
+
+      // Only show DPM option if DPM is actually installed
+      if (dpmAvailable) {
+        choices.push({ name: 'Official DPM Templates (advanced)', value: 'dpm' });
+      }
+
+      const typeAnswers = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'templateType',
+          message: 'What type of template would you like?',
+          choices
+        }
+      ]);
+      templateType = typeAnswers.templateType;
+    } else {
+      templateType = 'beginner';
+    }
+
+    if (templateType === 'dpm') {
+      if (!dpmAvailable) {
+        console.log(colors.red('❌ DPM required for official templates.'));
+        console.log(colors.yellow('Please install DPM first:'));
+        console.log(colors.white('  curl https://get.digitalasset.com/install/install.sh | sh'));
+        process.exit(1);
+      }
+
+      console.log('');
+      console.log(colors.cyan('Fetching DPM templates...'));
+      
+      const dpmTemplates = getDpmTemplates();
+      
+      if (dpmTemplates.length === 0) {
+        console.log(colors.yellow('⚠️  Could not fetch DPM templates.'));
+        console.log(colors.dim('Try running: dpm new --list'));
+        console.log('');
+        console.log(colors.yellow('Falling back to beginner templates...'));
+        templateType = 'beginner';
+      } else {
+        console.log(colors.green(`✅ Found ${dpmTemplates.length} DPM templates`));
+        console.log('');
+
+        const templateAnswers = await inquirer.prompt([
+          {
+            type: 'list',
+            name: 'dpmTemplate',
+            message: 'Select a DPM template:',
+            choices: dpmTemplates.map(t => ({ name: `  ${t}`, value: t })),
+            pageSize: 15
+          }
+        ]);
+
+        const success = await createFromDpmTemplate(projectName, templateAnswers.dpmTemplate);
+        
+        if (success) {
+          console.log('');
+          console.log(colors.cyan(colors.bold('📚 Next steps:')));
+          console.log('');
+          console.log(colors.white(`  cd ${projectName}`));
+          console.log(colors.white(`  dpm build`));
+          console.log(colors.white(`  dpm test`));
+          console.log('');
+        }
+        
+        return;
+      }
+    }
+
+    // Handle beginner templates
+    let template = options.template;
+    
     if (!wasTemplateProvided) {
       const answers = await inquirer.prompt([
         {
           type: 'list',
           name: 'template',
-          message: 'Which template would you like to use?',
+          message: 'Which template would you like?',
           choices: [
-            { name: 'Token Transfer System Template', value: 'TokenTransfer' },
-            { name: 'Multi-Party Agreement System Template', value: 'Multiparty' },
-            { name: 'Asset Holding System Template', value: 'AssetOwner' }
+            { name: 'Token Transfer System', value: 'TokenTransfer' },
+            { name: 'Multi-Party Agreement', value: 'Multiparty' },
+            { name: 'Asset Holding System', value: 'AssetOwner' }
           ]
         }
       ]);
@@ -164,7 +308,7 @@ async function create(projectName, options) {
     if (fs.existsSync(templatePath)) {
       fs.copySync(templatePath, projectPath);
     } else {
-      spinner.warn(colors.yellow(`Template ${template} not found, creating empty structure...`));
+      spinner.warn(colors.yellow(`Template ${template} not found.`));
       fs.mkdirSync(path.join(projectPath, 'daml'), { recursive: true });
     }
 
@@ -179,24 +323,34 @@ async function create(projectName, options) {
     spinner.succeed(colors.green('✨ Project created successfully!'));
 
     console.log('');
-    console.log(colors.cyan(colors.bold('📚 Next steps:')));
+    console.log(colors.cyan(colors.bold('Next steps:')));
     console.log('');
     console.log(colors.white(`  cd ${projectName}`));
     
-    if (isDamlInstalled()) {
-      console.log(colors.white(`  daml build          ${colors.dim('# Compile your contracts')}`));
-      console.log(colors.white(`  daml test           ${colors.dim('# Run tests')}`));
+    if (dpmAvailable) {
+      console.log(colors.white(`  dpm build           ${colors.dim('# Compile')}`));
+      console.log(colors.white(`  dpm test            ${colors.dim('# Run tests')}`));
     } else {
-      console.log(colors.yellow(`  # First, install Daml SDK:`));
-      console.log(colors.white(`  curl -sSL https://get.daml.com/ | sh`));
+      console.log(colors.yellow(`  # First, install DPM:`));
+      console.log(colors.white(`  curl https://get.digitalasset.com/install/install.sh | sh`));
+      console.log(colors.white(`  source ~/.zshrc`));
+      console.log(colors.white(`  dpm build`));
     }
     
     console.log('');
-    console.log(colors.dim('📖 Read README.md for more information'));
+    console.log(colors.dim('📖 Read README.md for more'));
     console.log('');
 
+    if (dpmJustInstalled) {
+      console.log(colors.cyan('💡 Tip: Restart your terminal or run:'));
+      console.log(colors.white(`  source ~/.zshrc`));
+      console.log(colors.dim('to use dpm commands immediately'));
+      console.log('');
+    }
+
   } catch (error) {
-    console.error(colors.red('❌ Error creating project:'), error.message);
+    console.error(colors.red('❌ Error:'), error.message);
+    console.error(error.stack);
     process.exit(1);
   }
 }
@@ -204,13 +358,13 @@ async function create(projectName, options) {
 function createScripts(projectPath) {
   const compileScript = `#!/bin/bash
 echo "🔨 Compiling Daml contracts..."
-daml build
+dpm build
 `;
   fs.writeFileSync(path.join(projectPath, 'scripts/compile.sh'), compileScript);
 
   const testScript = `#!/bin/bash
 echo "🧪 Running tests..."
-daml test
+dpm test
 `;
   fs.writeFileSync(path.join(projectPath, 'scripts/test.sh'), testScript);
 
@@ -234,6 +388,7 @@ dependencies:
 
 function createGitignore(projectPath) {
   const gitignore = `.daml/
+.dpm/
 *.dar
 *.log
 node_modules/
@@ -245,28 +400,31 @@ node_modules/
 function createReadme(projectPath, projectName, template) {
   const readme = `# ${projectName}
 
-> A Canton Network dApp built with create-canton-app
+> Built with create-canton-app
 
 ## Template: ${template}
 
 ## Quick Start
 
 \`\`\`bash
-# Compile contracts
-daml build
+dpm build  # Compile
+dpm test   # Run tests
+\`\`\`
+
+## Prerequisites
 
-# Run tests
-daml test
+\`\`\`bash
+curl https://get.digitalasset.com/install/install.sh | sh
 \`\`\`
 
 ## Learn More
 
 - [Canton Docs](https://docs.digitalasset.com)
-- [Daml Docs](https://docs.daml.com)
+- [DPM Docs](https://docs.digitalasset.com/build/3.4/dpm/dpm.html)
 - [Canton Network](https://canton.network)
 `;
   
   fs.writeFileSync(path.join(projectPath, 'README.md'), readme);
 }
 
-module.exports = create;
+module.exports = create;