devextreme-cli 1.3.1 → 1.4.0

package/src/utility/prompts/typescript.js

@@ -0,0 +1,18 @@
+const prompts = require('./prompts');
+
+const choices = [
+    { value: 'typescript', title: 'TypeScript' },
+    { value: 'javascript', title: 'JavaScript' }
+];
+
+const question = {
+    message: 'Specify desired template type:',
+    choices: choices
+};
+
+const getTemplateTypeInfo = async(defaultValue) => {
+    if(defaultValue === undefined) return 'javascript';
+    return await prompts(question, choices, defaultValue);
+};
+
+module.exports = getTemplateTypeInfo;

package/src/utility/prompts/vue-version.js

@@ -1,29 +1,17 @@
-const runPrompts = require('./prompts');
-const versions = [
+const prompts = require('./prompts');
+
+const choices = [
     { value: 'v2', title: 'Vue version (v2)' },
     { value: 'v3', title: 'Vue version (v3)' }
 ];
 
-const getValidVersion = (versionValue) => {
-    if(!versionValue || !versions.some((version) => `v${versionValue}` === version.value)) {
-        return;
-    }
-    return `v${versionValue}`;
+const question = {
+    message: 'What version do you want?',
+    choices: choices
 };
 
-const getVersionInfo = (versionValue) => {
-    const questions = [
-        {
-            type: 'select',
-            name: 'version',
-            message: 'What version do you want?',
-            choices: versions
-        }
-    ];
-
-    return runPrompts(questions, getValidVersion(versionValue));
+const getVersionInfo = async(defaultValue) => {
+    return await prompts(question, choices, `v${defaultValue}`);
 };
 
-module.exports = {
-    getVersionInfo
-};
+module.exports = getVersionInfo;

package/src/utility/template-creator.js

@@ -12,9 +12,9 @@ const applyTemplateToFile = (filePath, templateOptions) => {
     return content;
 };
 
-const addPageToApp = (pageName, pageDir, templatePagesPath) => {
+const addPageToApp = (pageName, pageDir, templatePagesPath, getCorrectExtension) => {
     fs.readdirSync(templatePagesPath).forEach((pageItem) => {
-        const pagePath = path.join(pageDir, `${pageName}${extname(pageItem)}`);
+        const pagePath = path.join(pageDir, `${pageName}${getCorrectExtension(extname(pageItem))}`);
         if(fs.existsSync(pagePath)) {
             console.error('The page already exists');
             process.exit();
@@ -25,19 +25,19 @@ const addPageToApp = (pageName, pageDir, templatePagesPath) => {
     });
 };
 
-const moveTemplateFilesToProject = (templateFolder, appPath, templateOptions, pathToFileRelativelyRoot) => {
+const moveTemplateFilesToProject = (templateFolder, appPath, templateOptions, getCorrectPath, pathToFileRelativelyRoot) => {
     const relativePath = pathToFileRelativelyRoot || '';
     const pathToFiles = path.join(templateFolder, relativePath);
 
     fs.readdirSync(pathToFiles).forEach(file => {
-        const pathToAppFile = path.join(appPath, relativePath, file);
+        const pathToAppFile = getCorrectPath(extname(file), path.join(appPath, relativePath, file), templateOptions.isTypeScript);
         const nextFilePath = path.join(pathToFiles, file);
 
         if(fs.lstatSync(nextFilePath).isDirectory()) {
             if(!fs.existsSync(pathToAppFile)) {
                 fs.mkdirSync(pathToAppFile);
             }
-            moveTemplateFilesToProject(templateFolder, appPath, templateOptions, path.join(relativePath, file));
+            moveTemplateFilesToProject(templateFolder, appPath, templateOptions, getCorrectPath, path.join(relativePath, file));
         } else {
             const content = applyTemplateToFile(nextFilePath, templateOptions);
             fs.writeFileSync(pathToAppFile, content);
@@ -45,7 +45,12 @@ const moveTemplateFilesToProject = (templateFolder, appPath, templateOptions, pa
     });
 };
 
+const getTempaltePath = (app) => {
+    return path.join(__dirname, '..', 'templates', app);
+};
+
 module.exports = {
     moveTemplateFilesToProject,
-    addPageToApp
+    addPageToApp,
+    getTempaltePath
 };

package/src/utility/typescript-extension.js

@@ -0,0 +1,24 @@
+const path = require('path');
+const devextremeConfigUtils = require('./devextreme-config');
+
+const isTypeScript = (templateType) => templateType === 'typescript';
+
+const setFileExtension = (filePath, isTypeScript) => {
+    const { dir, name } = path.parse(filePath);
+    const ext = '.' + (isTypeScript ? 'tsx' : 'js');
+
+    return path.join(dir, name + ext);
+};
+
+const getTemplateType = (engine) => {
+    const devextremeConfig = devextremeConfigUtils.read();
+    return devextremeConfig[engine]
+        ? devextremeConfig[engine].template
+        : 'javascript';
+};
+
+module.exports = {
+    isTypeScript,
+    setFileExtension,
+    getTemplateType
+};

package/src/templates/react/application/src/UnauthenticatedContent.js

@@ -1,35 +0,0 @@
-import React from 'react';
-import { Switch, Route, Redirect } from 'react-router-dom';
-import { SingleCard } from './layouts';
-import { LoginForm, ResetPasswordForm, ChangePasswordForm, CreateAccountForm } from './components';
-
-export default function UnauthenticatedContent() {
-  return (
-    <Switch>
-      <Route exact path='/login' >
-        <SingleCard title="Sign In">
-          <LoginForm />
-        </SingleCard>
-      </Route>
-      <Route exact path='/create-account' >
-        <SingleCard title="Sign Up">
-          <CreateAccountForm />
-        </SingleCard>
-      </Route>
-      <Route exact path='/reset-password' >
-        <SingleCard
-          title="Reset Password"
-          description="Please enter the email address that you used to register, and we will send you a link to reset your password via Email."
-        >
-          <ResetPasswordForm />
-        </SingleCard>
-      </Route>
-      <Route exact path='/change-password/:recoveryCode' >
-        <SingleCard title="Change Password">
-          <ChangePasswordForm />
-        </SingleCard>
-      </Route>
-      <Redirect to={'/login'} />
-    </Switch>
-  );
-}

package/src/templates/react/application/src/app-routes.js

@@ -1,24 +0,0 @@
-import { withNavigationWatcher } from './contexts/navigation';<%=^empty%>
-import { HomePage, TasksPage, ProfilePage } from './pages';<%=/empty%>
-
-const routes = [<%=^empty%>
-  {
-    path: '/tasks',
-    component: TasksPage
-  },
-  {
-    path: '/profile',
-    component: ProfilePage
-  },
-  {
-    path: '/home',
-    component: HomePage
-  }
-<%=/empty%>];
-
-export default routes.map(route => {
-  return {
-    ...route,
-    component: withNavigationWatcher(route.component)
-  };
-});

package/src/templates/react/application/src/components/index.js

@@ -1,7 +0,0 @@
-export { default as Header } from './header/header';
-export { default as Footer } from './footer/footer';
-export { default as LoginForm } from './login-form/login-form';
-export { default as ResetPasswordForm } from './reset-password-form/reset-password-form';
-export { default as CreateAccountForm } from './create-account-form/create-account-form';
-export { default as ChangePasswordForm } from './change-password-form/change-password-form';
-export { default as SideNavigationMenu } from './side-navigation-menu/side-navigation-menu';

package/src/templates/react/application/src/contexts/navigation.js

@@ -1,34 +0,0 @@
-import React, { useState, createContext, useContext, useEffect } from 'react';
-
-const NavigationContext = createContext({});
-const useNavigation = () => useContext(NavigationContext);
-
-function NavigationProvider(props) {
-  const [navigationData, setNavigationData] = useState({});
-
-  return (
-    <NavigationContext.Provider
-      value={{ navigationData, setNavigationData }}
-      {...props}
-    />
-  );
-}
-
-function withNavigationWatcher(Component) {
-  return function (props) {
-    const { path } = props.match;
-    const { setNavigationData } = useNavigation();
-
-    useEffect(() => {
-      setNavigationData({ currentPath: path });
-    }, [path, setNavigationData]);
-
-    return React.createElement(Component, props);
-  }
-}
-
-export {
-  NavigationProvider,
-  useNavigation,
-  withNavigationWatcher
-}