create-near-app 6.0.0-beta.2 → 6.0.0-beta.3

package/dist/app.js

@@ -31,11 +31,10 @@ const make_1 = require("./make");
 const user_input_1 = require("./user-input");
 const show = __importStar(require("./messages"));
 (async function () {
-    const promptResult = await (0, user_input_1.promptAndGetConfig)();
-    if (promptResult === null) {
+    const prompt = await (0, user_input_1.promptAndGetConfig)();
+    if (prompt === undefined)
         return;
-    }
-    const { config: { projectName, contract, frontend, tests, install, }, projectPath, } = promptResult;
+    const { config: { projectName, contract, frontend, tests, install, }, projectPath, } = prompt;
     show.creatingApp();
     let createSuccess;
     try {
@@ -44,8 +43,7 @@ const show = __importStar(require("./messages"));
             frontend,
             tests,
             projectName,
-            verbose: false,
-            rootDir: path_1.default.resolve(__dirname, '../templates'),
+            templatesDir: path_1.default.resolve(__dirname, '../templates'),
             projectPath,
         });
     }
@@ -53,15 +51,12 @@ const show = __importStar(require("./messages"));
         console.error(e);
         createSuccess = false;
     }
-    if (install) {
-        await (0, make_1.runDepsInstall)(projectPath);
-    }
     if (createSuccess) {
+        install && await (0, make_1.runDepsInstall)(projectPath);
         show.setupSuccess(projectName, contract, frontend, install);
     }
     else {
-        show.setupFailed();
-        return;
+        return show.setupFailed();
     }
 })();
 //# sourceMappingURL=app.js.map

package/dist/make.js

@@ -26,104 +26,67 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runDepsInstall = exports.copyDir = exports.renameFile = exports.createFiles = exports.createProject = void 0;
+exports.runDepsInstall = exports.copyDir = exports.createProject = void 0;
 const show = __importStar(require("./messages"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const fs_1 = __importDefault(require("fs"));
 const ncp_1 = require("ncp");
 const path_1 = __importDefault(require("path"));
-const package_json_1 = require("./package-json");
-async function createProject({ contract, frontend, tests, projectPath, projectName, verbose, rootDir }) {
-    // Create files in the project folder
-    await createFiles({ contract, frontend, projectName, tests, projectPath, verbose, rootDir });
-    // Create package.json
-    const packageJson = (0, package_json_1.buildPackageJson)({ contract, frontend, tests, projectName });
-    fs_1.default.writeFileSync(path_1.default.resolve(projectPath, 'package.json'), Buffer.from(JSON.stringify(packageJson, null, 2)));
+async function createProject({ contract, frontend, tests, projectPath, projectName, templatesDir }) {
+    if (contract !== 'none') {
+        await createContract({ contract, tests, projectPath, projectName, templatesDir });
+    }
+    else {
+        await createGateway({ frontend, projectPath, projectName, templatesDir });
+    }
     return true;
 }
 exports.createProject = createProject;
-async function createFiles({ contract, frontend, tests, projectPath, verbose, rootDir }) {
-    // skip build artifacts and symlinks
-    const skip = ['.cache', 'dist', 'out', 'node_modules'];
-    // copy frontend
-    if (frontend !== 'none') {
-        const sourceFrontendDir = path_1.default.resolve(`${rootDir}/frontend/${frontend}`);
-        const targetFrontendDir = path_1.default.resolve(`${projectPath}/frontend`);
-        fs_1.default.mkdirSync(targetFrontendDir, { recursive: true });
-        await copyDir(sourceFrontendDir, targetFrontendDir, { verbose, skip: skip.map(f => path_1.default.join(sourceFrontendDir, f)) });
-    }
-    // shared files
-    const sourceSharedDir = path_1.default.resolve(rootDir, 'shared');
-    await copyDir(sourceSharedDir, projectPath, { verbose, skip: skip.map(f => path_1.default.join(sourceSharedDir, f)) });
-    // copy contract files
-    if (contract !== 'none') {
-        const sourceContractDir = path_1.default.resolve(rootDir, 'contracts', contract);
-        const targetContractDir = path_1.default.resolve(projectPath, 'contract');
-        fs_1.default.mkdirSync(targetContractDir, { recursive: true });
-        await copyDir(sourceContractDir, targetContractDir, {
-            verbose,
-            skip: skip.map(f => path_1.default.join(sourceContractDir, f))
-        });
-    }
-    // tests dir
-    if (contract !== 'none') {
-        const targetTestDir = path_1.default.resolve(projectPath, 'integration-tests');
-        fs_1.default.mkdirSync(targetTestDir, { recursive: true });
-        // copy tests - shared files
-        const sourceTestSharedDir = path_1.default.resolve(`${rootDir}/integration-tests/${tests}-tests`);
-        await copyDir(sourceTestSharedDir, targetTestDir, {
-            verbose,
-            skip: skip.map(f => path_1.default.join(sourceTestSharedDir, f))
-        });
+async function createContract({ contract, tests, projectPath, projectName, templatesDir }) {
+    // contract folder
+    const sourceContractDir = path_1.default.resolve(templatesDir, 'contracts', contract);
+    const targetContractDir = projectPath;
+    fs_1.default.mkdirSync(targetContractDir, { recursive: true });
+    await copyDir(sourceContractDir, targetContractDir);
+    // copy sandbox-test dir
+    const targetTestDir = path_1.default.resolve(projectPath, `sandbox-${tests}`);
+    const sourceTestDir = path_1.default.resolve(`${templatesDir}/sandbox-tests/sandbox-${tests}`);
+    fs_1.default.mkdirSync(targetTestDir);
+    await copyDir(sourceTestDir, targetTestDir);
+    if (contract === 'rs') {
+        if (tests === 'rs') {
+            // leave only one test script
+            fs_1.default.unlinkSync(path_1.default.resolve(projectPath, 'test-ts.sh'));
+            fs_1.default.renameSync(path_1.default.resolve(projectPath, 'test-rs.sh'), path_1.default.resolve(projectPath, 'test.sh'));
+            // add workspace to Cargo.toml
+            const cargoTomlPath = path_1.default.resolve(projectPath, 'Cargo.toml');
+            const cargoToml = fs_1.default.readFileSync(cargoTomlPath).toString();
+            const cargoTomlWithWorkspace = cargoToml + '\n[workspace]\nmembers = ["sandbox-rs"]';
+            fs_1.default.writeFileSync(cargoTomlPath, cargoTomlWithWorkspace);
+        }
+        else {
+            // leave only one test script
+            fs_1.default.unlinkSync(path_1.default.resolve(projectPath, 'test-rs.sh'));
+            fs_1.default.renameSync(path_1.default.resolve(projectPath, 'test-ts.sh'), path_1.default.resolve(projectPath, 'test.sh'));
+        }
     }
-    // add .gitignore
-    await (0, exports.renameFile)(`${projectPath}/template.gitignore`, `${projectPath}/.gitignore`);
 }
-exports.createFiles = createFiles;
-const renameFile = async function (oldPath, newPath) {
-    return new Promise((resolve, reject) => {
-        fs_1.default.rename(oldPath, newPath, err => {
-            if (err) {
-                console.error(err);
-                reject(err);
-                return;
-            }
-            resolve();
-        });
-    });
-};
-exports.renameFile = renameFile;
+async function createGateway({ frontend, projectPath, projectName, templatesDir }) {
+    const sourceFrontendDir = path_1.default.resolve(`${templatesDir}/frontend/${frontend}`);
+    const targetFrontendDir = path_1.default.resolve(`${projectPath}`);
+    fs_1.default.mkdirSync(targetFrontendDir, { recursive: true });
+    await copyDir(sourceFrontendDir, targetFrontendDir);
+}
 // Wrap `ncp` tool to wait for the copy to finish when using `await`
-// Allow passing `skip` variable to skip copying an array of filenames
-function copyDir(source, dest, { skip, verbose }) {
+function copyDir(source, dest) {
     return new Promise((resolve, reject) => {
-        const copied = [];
-        const skipped = [];
-        const filter = skip && function (filename) {
-            const shouldCopy = !skip.find(f => filename.includes(f));
-            shouldCopy ? copied.push(filename) : skipped.push(filename);
-            return !skip.find(f => filename.includes(f));
-        };
-        (0, ncp_1.ncp)(source, dest, { filter }, err => {
-            if (err) {
-                reject(err);
-                return;
-            }
-            if (verbose) {
-                console.log('Copied:');
-                copied.forEach(f => console.log('  ' + f));
-                console.log('Skipped:');
-                skipped.forEach(f => console.log('  ' + f));
-            }
-            resolve();
-        });
+        (0, ncp_1.ncp)(source, dest, {}, err => err ? reject(err) : resolve());
     });
 }
 exports.copyDir = copyDir;
 async function runDepsInstall(projectPath) {
     show.depsInstall();
-    const npmCommandArgs = ['install'];
-    await new Promise((resolve, reject) => (0, cross_spawn_1.default)('npm', npmCommandArgs, {
+    await new Promise((resolve, reject) => (0, cross_spawn_1.default)('npm', ['install'], {
         cwd: projectPath,
         stdio: 'inherit',
     }).on('close', (code) => {

package/dist/messages.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depsInstallError = exports.depsInstall = exports.creatingApp = exports.directoryExists = exports.windowsWarning = exports.unsupportedNodeVersion = exports.argsError = exports.setupSuccess = exports.successFrontendToText = exports.successContractToText = exports.setupFailed = exports.welcome = exports.show = void 0;
+exports.depsInstallError = exports.depsInstall = exports.creatingApp = exports.directoryExists = exports.windowsWarning = exports.unsupportedNodeVersion = exports.argsError = exports.gatewayInstructions = exports.contractInstructions = exports.setupSuccess = exports.successFrontendToText = exports.successContractToText = exports.setupFailed = exports.welcome = exports.show = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const tracking_1 = require("./tracking");
 if (process.env.NEAR_NO_COLOR) {
@@ -11,46 +11,54 @@ if (process.env.NEAR_NO_COLOR) {
 }
 const show = (...args) => console.log(...args);
 exports.show = show;
-const welcome = () => (0, exports.show)((0, chalk_1.default) `{blue ======================================================}
-👋 {bold {green Welcome to NEAR!}} Learn more: https://docs.near.org/
-🔧 Let's get your dApp ready.
+const welcome = () => (0, exports.show)((0, chalk_1.default) `
 {blue ======================================================}
-(${tracking_1.trackingMessage})
-`);
+👋 {bold {green Welcome to Near!}} Learn more: https://docs.near.org/
+🔧 Let's get your project ready.
+{blue ======================================================}
+(${tracking_1.trackingMessage})`);
 exports.welcome = welcome;
 const setupFailed = () => (0, exports.show)((0, chalk_1.default) `{bold {red ==========================================}}
-{red ⛔️ There was a problem during NEAR project setup}.
+{red ⛔️ There was a problem during the project setup}.
 Please refer to https://github.com/near/create-near-app README to troubleshoot.
 Notice: some platforms aren't supported (yet).
 {bold {red ==========================================}}`);
 exports.setupFailed = setupFailed;
-const successContractToText = (contract) => contract === 'none' ? '' : (0, chalk_1.default) `with a smart contract in {bold ${contract === 'rust' ? 'Rust' : 'JavaScript'}}`;
+const successContractToText = (contract) => contract === 'none' ? '' : (0, chalk_1.default) `a smart contract in {bold ${contract === 'rs' ? 'Rust' : 'Typescript'}}`;
 exports.successContractToText = successContractToText;
-const successFrontendToText = (frontend) => frontend === 'none' ? '' : (0, chalk_1.default) ` and a frontend template${frontend === 'gateway' ? (0, chalk_1.default) `{bold  in React.js}` : ''}`;
+const successFrontendToText = (frontend) => frontend === 'none' ? '' : (0, chalk_1.default) `a gateway using ${frontend === 'next' ? 'NextJS + React' : 'Vanilla-JS'}`;
 exports.successFrontendToText = successFrontendToText;
 const setupSuccess = (projectName, contract, frontend, install) => (0, exports.show)((0, chalk_1.default) `
 {green ======================================================}
-✅  Success! Created '${projectName}'
-   ${(0, exports.successContractToText)(contract)}${(0, exports.successFrontendToText)(frontend)}.
-${contract === 'rust' ? (0, chalk_1.default) `🦀 If you are new to Rust please visit {bold {green https://www.rust-lang.org }}\n` : ''}
-  {bold {bgYellow {black Your next steps}}}:
+✅  Success! Created '${projectName}', ${(0, exports.successContractToText)(contract)}${(0, exports.successFrontendToText)(frontend)}.
+${contract === 'rs' ? (0, chalk_1.default) `🦀 If you are new to Rust please visit {bold {green https://www.rust-lang.org }}\n` : ''}
+{bold {bgYellow {black Next steps}}}:
+${(0, exports.contractInstructions)(projectName, contract, install)}${(0, exports.gatewayInstructions)(projectName, frontend, install)}`);
+exports.setupSuccess = setupSuccess;
+const contractInstructions = (projectName, contract, install) => contract === 'none' ? '' : (0, chalk_1.default) `
    - {inverse Navigate to your project}:
          {blue cd {bold ${projectName}}}
-   ${!install ? (0, chalk_1.default) `- {inverse Install all dependencies}
+${contract === 'ts' && !install ? (0, chalk_1.default) `   - {inverse Install all dependencies}
          {blue npm {bold install}}` : 'Then:'}
    - {inverse Build your contract}:
-         {blue npm {bold run build}}
-   - {inverse Test your contract} in NEAR SandBox:
-         {blue npm {bold test}}
+         ${contract === 'ts' ? (0, chalk_1.default) `{blue npm {bold run build}}` : (0, chalk_1.default) `{blue {bold ./build.sh}}`}
+   - {inverse Test your contract} in the Sandbox:
+         ${contract === 'ts' ? (0, chalk_1.default) `{blue npm {bold run test}}` : (0, chalk_1.default) `{blue {bold ./test.sh}}`}
    - {inverse Deploy your contract} to NEAR TestNet with a temporary dev account:
-         {blue npm {bold run deploy}}
-   ${frontend !== 'none' ? (0, chalk_1.default) `- {inverse Start your frontend}:
-         {blue npm {bold start}}\n` : ''}
-🧠 Read {bold {greenBright README.md}} to explore further.`);
-exports.setupSuccess = setupSuccess;
+         ${contract === 'ts' ? (0, chalk_1.default) `{blue npm {bold run deploy}}` : (0, chalk_1.default) `{blue {bold ./deploy.sh}}`}
+🧠 Read {bold {greenBright README.md}} to explore further`;
+exports.contractInstructions = contractInstructions;
+const gatewayInstructions = (projectName, frontend, install) => frontend === 'none' ? '' : (0, chalk_1.default) `
+   - {inverse Navigate to your project}:
+         {blue cd {bold ${projectName}}}
+${!install ? (0, chalk_1.default) `   - {inverse Install all dependencies}
+         {blue pnpm {bold install}}` : 'Then:'}
+   - {inverse Start your app}:
+         {blue pnpm {bold run dev}}`;
+exports.gatewayInstructions = gatewayInstructions;
 const argsError = () => (0, exports.show)((0, chalk_1.default) `{red Arguments error}
 Run {blue npx create-near-app} without arguments, or use:
-npx create-near-app <projectName> --contract rust|js --frontend react|vanilla|none --tests js|rust`);
+npx create-near-app <projectName> --frontend next|vanilla|none --contract rs|ts|none --tests rs|ts|none`);
 exports.argsError = argsError;
 const unsupportedNodeVersion = (supported) => (0, exports.show)((0, chalk_1.default) `{red We support node.js version ${supported} or later}`);
 exports.unsupportedNodeVersion = unsupportedNodeVersion;

package/dist/package-json.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildPackageJson = void 0;
-function buildPackageJson({ contract, frontend, tests, projectName }) {
+exports.buildPackagetson = void 0;
+function buildPackagetson({ contract, frontend, tests, projectName }) {
     const result = basePackage({
         contract, frontend, tests, projectName,
     });
     return result;
 }
-exports.buildPackageJson = buildPackageJson;
+exports.buildPackagetson = buildPackagetson;
 function basePackage({ contract, frontend, tests, projectName }) {
     const hasFrontend = frontend !== 'none';
     return {
@@ -42,11 +42,11 @@ const buildScript = (hasFrontend) => hasFrontend ? {
 const buildContractScriptName = 'build:contract';
 const buildContractScript = (contract) => {
     switch (contract) {
-        case 'js':
+        case 'ts':
             return {
                 [buildContractScriptName]: 'cd contract && npm run build',
             };
-        case 'rust':
+        case 'rs':
             return {
                 [buildContractScriptName]: 'cd contract && ./build.sh',
             };
@@ -58,11 +58,11 @@ const buildContractScript = (contract) => {
 };
 const deployScript = (contract) => {
     switch (contract) {
-        case 'js':
+        case 'ts':
             return {
                 'deploy': 'cd contract && npm run deploy',
             };
-        case 'rust':
+        case 'rs':
             return {
                 'deploy': 'cd contract && ./deploy.sh',
             };
@@ -74,9 +74,9 @@ const deployScript = (contract) => {
 };
 const unitTestScripts = (contract) => {
     switch (contract) {
-        case 'js':
+        case 'ts':
             return { 'test:unit': 'cd contract && npm test' };
-        case 'rust':
+        case 'rs':
             return { 'test:unit': 'cd contract && cargo test' };
         case 'none':
             return { 'test:unit': 'echo "No contract to test"' };
@@ -88,19 +88,19 @@ const integrationTestScripts = (contract, tests) => {
     }
     let wasm_path = '';
     switch (contract) {
-        case 'js':
+        case 'ts':
             wasm_path = 'contract/build/hello_near.wasm';
             break;
-        case 'rust':
+        case 'rs':
             wasm_path = 'contract/target/wasm32-unknown-unknown/release/hello_near.wasm';
             break;
     }
     let run_test = '';
     switch (tests) {
-        case 'js':
+        case 'ts':
             run_test = `npm test -- -- "./${wasm_path}"`;
             break;
-        case 'rust':
+        case 'rs':
             run_test = `cargo run --example integration-tests "../${wasm_path}"`;
             break;
     }
@@ -110,13 +110,13 @@ const integrationTestScripts = (contract, tests) => {
 };
 const npmInstallScript = (contract, hasFrontend, tests) => {
     const frontend_install = hasFrontend ? 'cd frontend && npm install && cd ..' : 'echo no frontend';
-    const test_install = (tests === 'js') ? 'cd integration-tests && npm install && cd ..' : 'echo rs tests';
+    const test_install = (contract !== 'none' && tests === 'ts') ? 'cd integration-tests && npm install && cd ..' : 'echo no ts test';
     let contract_install = '';
     switch (contract) {
-        case 'js':
+        case 'ts':
             contract_install = 'cd contract && npm install';
             break;
-        case 'rust':
+        case 'rs':
             contract_install = 'echo rs contract';
             break;
         case 'none':

package/dist/tracking.js

@@ -8,7 +8,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const mixpanel_1 = __importDefault(require("mixpanel"));
 const MIXPANEL_TOKEN = 'df164f13212cbb0dfdae991da60e87f2';
 const tracker = mixpanel_1.default.init(MIXPANEL_TOKEN);
-exports.trackingMessage = (0, chalk_1.default) `NEAR collects anonymous information on the commands used. No personal information that could identify you is shared`;
+exports.trackingMessage = (0, chalk_1.default) `Near collects anonymous information on the commands used. No personal information that could identify you is shared`;
 // TODO: track different failures & install usage
 const trackUsage = async (frontend, contract) => {
     // prevents logging from CI

package/dist/types.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TESTING_FRAMEWORKS = exports.FRONTENDS = exports.CONTRACTS = void 0;
-exports.CONTRACTS = ['js', 'rust'];
-exports.FRONTENDS = ['gateway', 'vanilla', 'none'];
-exports.TESTING_FRAMEWORKS = ['rust', 'js'];
+exports.APPS = exports.TESTING_FRAMEWORKS = exports.FRONTENDS = exports.CONTRACTS = void 0;
+exports.CONTRACTS = ['ts', 'rs', 'none'];
+exports.FRONTENDS = ['next', 'vanilla', 'none'];
+exports.TESTING_FRAMEWORKS = ['rs', 'ts', 'none'];
+exports.APPS = ['contract', 'gateway'];
 //# sourceMappingURL=types.js.map

package/dist/user-input.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectPath = exports.promptAndGetConfig = exports.userAnswersAreValid = exports.showProjectNamePrompt = exports.getUserAnswers = exports.validateUserArgs = exports.getUserArgs = void 0;
+exports.projectPath = exports.promptAndGetConfig = exports.getUserAnswers = exports.validateUserArgs = exports.getUserArgs = void 0;
 const types_1 = require("./types");
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
@@ -38,10 +38,11 @@ const fs_1 = __importDefault(require("fs"));
 async function getUserArgs() {
     commander_1.program
         .argument('[projectName]')
-        .option('--contract <contract>')
-        .option('--frontend <frontend>')
-        .option('--tests <tests>')
-        .option('--install');
+        .option('--contract [ts|rs|none]')
+        .option('--frontend [next|vanilla|none]')
+        .option('--tests [rs|ts|none]')
+        .option('--install')
+        .addHelpText('after', 'You can create a frontend or a contract with tests');
     commander_1.program.parse();
     const options = commander_1.program.opts();
     const [projectName] = commander_1.program.args;
@@ -74,120 +75,111 @@ function validateUserArgs(args) {
     }
 }
 exports.validateUserArgs = validateUserArgs;
+const appChoices = [
+    { title: 'A Near Smart Contract', description: 'A smart contract to be deployed in the Near Blockchain', value: 'contract' },
+    { title: 'A Near Gateway (Web App)', description: 'A multi-chain App that talks with Near contracts and Near components', value: 'gateway' },
+];
 const contractChoices = [
-    { title: 'Yes, in TypeScript', description: 'Build a Near contract using javascript/typescript', value: 'js' },
-    { title: 'Yes, in Rust', description: 'Build a Near contract using Rust', value: 'rust' },
-    { title: 'No', description: 'You are not building a Near smart contract', value: 'none' },
+    { title: 'JS/TS Contract', description: 'A Near contract written in javascript/typescript', value: 'ts' },
+    { title: 'Rust Contract', description: 'A Near contract written in Rust', value: 'rs' },
 ];
 const testsChoices = [
-    { title: 'Tests written in Rust', value: 'rust' },
-    { title: 'Tests written in Javascript', value: 'js' },
+    { title: 'Tests written in Rust', value: 'rs' },
+    { title: 'Tests written in Typescript', value: 'ts' },
 ];
 const frontendChoices = [
-    { title: 'Composable web app (Gateway)', description: 'Leverage next.js and web3 components to create multi-chain apps', value: 'gateway' },
-    { title: 'Vanilla web app', description: 'Interact with the Near blockchain using a simple web app', value: 'vanilla' },
-    { title: 'No frontend', description: 'Build a smart contract with no frontend', value: 'none' },
+    { title: 'NextJs + React', description: 'A composable app built using Next.js, React and Near components', value: 'next' },
+    { title: 'Vanilla JS', description: 'A framework-less web app with limited capabilities.', value: 'vanilla' },
 ];
-const userPrompts = [
-    {
-        type: 'select',
-        name: 'frontend',
-        message: 'Frontend: What kind of App are you building?',
-        choices: frontendChoices,
-    },
+const appPrompt = {
+    type: 'select',
+    name: 'app',
+    message: 'What do you want to build?',
+    choices: appChoices,
+};
+const frontendPrompt = {
+    type: 'select',
+    name: 'frontend',
+    message: 'Select a framework for your frontend (Gateway)',
+    choices: frontendChoices,
+};
+const contractPrompt = [
     {
         type: 'select',
         name: 'contract',
-        message: 'Contract: Are you building a NEAR contract?',
+        message: 'Select a smart contract template for your project',
         choices: contractChoices,
     },
     {
-        type: prev => prev === 'rust' ? 'select' : null,
+        type: prev => prev === 'rs' ? 'select' : null,
         name: 'tests',
         message: 'Sandbox Testing: Which language do you prefer to test your contract?',
         choices: testsChoices,
-    },
-    {
-        type: 'text',
-        name: 'projectName',
-        message: 'Name your project (this will create a directory with that name)',
-        initial: 'hello-near',
-    },
-    {
-        type: 'confirm',
-        name: 'install',
-        message: (0, chalk_1.default) `Run {bold {blue 'npm install'}} now?`,
-        initial: true,
-    },
+    }
 ];
+const namePrompts = {
+    type: 'text',
+    name: 'projectName',
+    message: 'Name your project (we will create a directory with that name)',
+    initial: 'hello-near',
+};
+const npmPrompt = {
+    type: 'confirm',
+    name: 'install',
+    message: (0, chalk_1.default) `Run {bold {blue 'npm install'}} now?`,
+    initial: true,
+};
+const promptUser = async (prompts) => {
+    // Prompt, and exit if user cancels
+    return (0, prompts_1.default)(prompts, { onCancel: () => process.exit(0) });
+};
 async function getUserAnswers() {
-    const answers = await (0, prompts_1.default)(userPrompts);
-    if (!answers.tests) {
-        answers.tests = answers.contract !== 'rust' ? 'js' : 'rust';
-    }
-    return answers;
-}
-exports.getUserAnswers = getUserAnswers;
-async function showProjectNamePrompt() {
-    const [, , , projectName] = userPrompts;
-    const answers = await (0, prompts_1.default)([projectName]);
-    return answers;
-}
-exports.showProjectNamePrompt = showProjectNamePrompt;
-function userAnswersAreValid(answers) {
-    const { contract, frontend, projectName, tests } = answers;
-    if ([contract, frontend, projectName, tests].includes(undefined)) {
-        return false;
+    // Either the user wants a gateway or a contract
+    const { app } = await promptUser(appPrompt);
+    if (app === 'gateway') {
+        // If gateway, ask for the framework to use
+        const { frontend, projectName, install } = await promptUser([frontendPrompt, namePrompts, npmPrompt]);
+        return { frontend, contract: 'none', tests: 'none', projectName, install };
     }
     else {
-        return true;
+        // If contract, ask for the language for the contract and tests
+        let { contract, tests } = await promptUser(contractPrompt);
+        tests = contract === 'ts' ? 'ts' : tests;
+        const { projectName } = await promptUser(namePrompts);
+        const install = contract === 'ts' ? (await promptUser(npmPrompt)).install : false;
+        return { frontend: 'none', contract, tests, projectName, install };
     }
 }
-exports.userAnswersAreValid = userAnswersAreValid;
+exports.getUserAnswers = getUserAnswers;
 async function promptAndGetConfig() {
-    let config = null;
-    let isFromPrompts = false;
-    // process cli args
-    const args = await getUserArgs();
-    const argsValid = validateUserArgs(args);
-    if (argsValid === 'error') {
-        show.argsError();
-        return null;
-    }
-    else if (argsValid === 'ok') {
-        config = args;
-    }
-    show.welcome();
-    const nodeVersion = process.version;
     const supportedNodeVersion = require('../package.json').engines.node;
-    if (!semver_1.default.satisfies(nodeVersion, supportedNodeVersion)) {
-        show.unsupportedNodeVersion(supportedNodeVersion);
-        // TODO: track unsupported versions
-        return null;
+    if (!semver_1.default.satisfies(process.version, supportedNodeVersion)) {
+        return show.unsupportedNodeVersion(supportedNodeVersion);
     }
     if (process.platform === 'win32') {
-        // TODO: track windows
-        show.windowsWarning();
-        return null;
+        return show.windowsWarning();
+    }
+    // process cli args
+    let args = await getUserArgs();
+    if (args.contract && (!args.tests || args.frontend)) {
+        return show.argsError();
+    }
+    if (args.frontend && (args.tests || args.contract)) {
+        return show.argsError();
     }
-    // Get user input
-    if (config === null) {
-        const userInput = await getUserAnswers();
-        isFromPrompts = true;
-        if (!userAnswersAreValid(userInput)) {
-            throw new Error(`Invalid prompt. ${JSON.stringify(userInput)}`);
-        }
-        config = userInput;
+    // If no args, prompt user
+    if (!args.contract && !args.frontend) {
+        show.welcome();
+        args = await getUserAnswers();
     }
-    const { frontend, contract } = config;
+    // track user input
+    const { frontend, contract } = args;
     (0, tracking_1.trackUsage)(frontend, contract);
-    let path = (0, exports.projectPath)(config.projectName);
-    // If dir exists warn and exit
+    let path = (0, exports.projectPath)(args.projectName);
     if (fs_1.default.existsSync(path)) {
-        show.directoryExists(path);
-        return null;
+        return show.directoryExists(path);
     }
-    return { config, projectPath: path, isFromPrompts };
+    return { config: args, projectPath: path };
 }
 exports.promptAndGetConfig = promptAndGetConfig;
 const projectPath = (projectName) => `${process.cwd()}/${projectName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-beta.3",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {

package/templates/contracts/{rust → rs}/Cargo.toml

@@ -18,6 +18,3 @@ lto = true
 debug = false
 panic = "abort"
 overflow-checks = true
-
-[workspace]
-members = []