add ejs and api.render

Author: fratzinger

generator/createService.js

@@ -5,40 +5,23 @@ module.exports = (api, options) => {
 
   if (options.actionType !== 'service') throw 'service not defined!';
 
-  const feathersClientPath = options.service.feathersClientPath || '@/store/feathers-client.js';
-  const globalClientPath = api.resolve(feathersClientPath);
+  const clientPath = options.service.feathersClientPath || '@/store/feathers-client.js';
+  const globalClientPath = api.resolve(clientPath);
   if (fs.existsSync(globalClientPath)) {
     throw `feathers-client file at ${globalClientPath} !`;
   }
 
   createServicesFolder();
 
-  const file = require.resolve('./templates/service.js');
-
-  let service = fs.readFileSync(file, { encoding: 'utf-8' });
-
   const servicePath = options.service.path;
-  const serviceIdField = options.service.idField;
-
-  if (!servicePath) throw 'service-path not defined!';
-
-  const serviceFilePath = api.resolve(`./src/store/services/${servicePath}.js`);
-
-  if (fs.existsSync(serviceFilePath)) throw 'service already exists!';
-
-  service = service.replace('%CLIENTPATH%', feathersClientPath);
-  service = service.replace('%SERVICEPATH%', servicePath);
-  service = service.replace('%IDFIELD%', serviceIdField);
-
-  let instanceDefaultsFile = require.resolve('./templates/instanceDefaultsFn.js');
-
-  if (options.service && options.service.instanceDefaults === 'obj') {
-    instanceDefaultsFile = require.resolve('./templates/instanceDefaultsObj.js');
-  }
-
-  const instanceDefaults = fs.readFileSync(instanceDefaultsFile, { encoding: 'utf-8' });
-
-  service = service.replace('%INSTANCEDEFAULTS%', instanceDefaults);
-
-  fs.writeFileSync(serviceFilePath, service);
+  const { idField, instanceDefaults } = options.service;
+
+  api.render({
+    [`./src/store/services/${servicePath}.js`]: './templates/store/services/service.js',
+  }, {
+    clientPath,
+    idField,
+    servicePath,
+    instanceDefaults,
+  });
 };

generator/index.js

@@ -4,11 +4,11 @@ module.exports = (api, options) => {
     throw "Vuex not installed! Please run 'vue add vuex' first!";
   }
 
-  const isInit = options.actionType == "init";
+  const isInit = options.actionType == 'init';
 
-  if (isInit) require("./init.js")(api, options);
+  if (isInit) require('./init.js')(api, options);
 
-  const isService = options.actionType == "service";
+  const isService = options.actionType == 'service';
 
-  if (isService) require("./createService.js")(api, options);
-};
+  if (isService) require('./createService.js')(api, options);
+};

generator/init.js

@@ -3,7 +3,8 @@ const fs = require('fs');
 module.exports = (api, options) => {
   const { createServicesFolder } = require('./utils')(api);
 
-  console.log('Hallo');
+  const storePlainFile = api.resolve('./src/store.js');
+  const storeFolder = api.resolve('./src/store/');
 
   api.extendPackage({
     dependencies: {
@@ -16,8 +17,6 @@ module.exports = (api, options) => {
   });
 
   const moveStorePlainToFolderIndex = () => {
-    const storePlainFile = api.resolve('./src/store.js');
-    const storeFolder = api.resolve('./src/store/');
     const storeIndexFile = api.resolve('./src/store/index.js');
 
     try {
@@ -33,30 +32,14 @@ module.exports = (api, options) => {
     }
   };
 
-  const feathersClientFile = () => {
-    const url = options.init.serverUrl || 'http://localhost:3030';
-
-    const array = ["import feathers from '@feathersjs/feathers';",
-      "import socketio from '@feathersjs/socketio-client';",
-      "import auth from '@feathersjs/authentication-client';",
-      "import io from 'socket.io-client';",
-      '',
-      `const socket = io('${url}', {transports: ['websocket']});`,
-      '',
-      'const feathersClient = feathers()',
-      '  .configure(socketio(socket))',
-      '  .configure(auth({ storage: window.localStorage }));',
-      '',
-      'export default feathersClient;'];
-
-    return array.join('\n');
-  };
-
-  function copyFeathersClientFile() {
-    const file = api.resolve('./src/store/feathers-client.js');
+  function createFeathersClientFile() {
+    const clientFilePath = './src/store/feathers-client.js';
+    const file = api.resolve(clientFilePath);
     if (!fs.existsSync(file)) {
-      fs.writeFileSync(file, feathersClientFile(), (err) => {
-        if (err) console.log(err);
+      api.render({
+        clientFilePath: './templates/store/feathers-client.js',
+      }, {
+        serverUrl: options.init.serverUrl,
       });
     }
   }
@@ -127,10 +110,8 @@ module.exports = (api, options) => {
     fs.writeFileSync(storeFile, storeLines.join('\n'), { encoding: 'utf-8' });
   }
 
-  api.onCreateComplete(() => {
-    moveStorePlainToFolderIndex();
-    copyFeathersClientFile();
-    modifyStoreFile();
-    createServicesFolder();
-  });
+  moveStorePlainToFolderIndex();
+  createFeathersClientFile();
+  modifyStoreFile();
+  createServicesFolder();
 };

generator/templates/instanceDefaultsFn.js

@@ -0,0 +1,12 @@
+import feathers from '@feathersjs/feathers';
+import socketio from '@feathersjs/socketio-client';
+import auth from '@feathersjs/authentication-client';
+import io from 'socket.io-client';
+
+const socket = io('<%= serverUrl %>', { transports: ['websocket'] });
+
+const feathersClient = feathers()
+  .configure(socketio(socket))
+  .configure(auth({ storage: window.localStorage }));
+
+export default feathersClient;

generator/templates/instanceDefaultsObj.js

@@ -1,13 +1,22 @@
 /* eslint-disable no-unused-vars */
 
 import feathersVuex from 'feathers-vuex';
-import feathersClient from '%CLIENTPATH%';
+import feathersClient from '<%= clientPath %>';
 
-const { service } = feathersVuex(feathersClient, { idField: '%IDFIELD%' });
+const { service } = feathersVuex(feathersClient, { idField: '<%= idField %>' });
 
-const servicePath = '%SERVICEPATH%';
+const servicePath = '<%= servicePath %>';
 const servicePlugin = service(servicePath, {
-%INSTANCEDEFAULTS%
+<% if ( instanceDefaults == "obj" ) { -%>
+  instanceDefaults: {
+
+  },
+<%_ } else { -%>
+  instanceDefaults(data, { store, Model, Models }) {
+    return {
+    };
+  },
+<%_ } -%>
 });
 
 feathersClient.service(servicePath)

generator/templates/store/feathers-client.js

@@ -1,86 +1,86 @@
 module.exports = [
   {
-    name: `actionType`,
+    name: 'actionType',
     type: 'list',
     message: 'What do you want to do?',
     choices: [
-      { 
-        name: "init feathers-vuex",
-        value: "init"
+      {
+        name: 'init feathers-vuex',
+        value: 'init',
       }, {
-        name: "add service",
-        value: "service"
-      }
+        name: 'add service',
+        value: 'service',
+      },
     ],
     default: 0,
   },
-  //#region init
+  // #region init
   {
-    when: answers => answers.actionType == "init",
-    name: `init.serverUrl`,
+    when: answers => answers.actionType === 'init',
+    name: 'init.serverUrl',
     type: 'input',
     message: 'What is the url of your feathers server instance?',
-    default: "http://localhost:3030",
+    default: 'http://localhost:3030',
   },
   {
-    when: answers => answers.actionType == "init",
-    name: `init.isAuth`,
+    when: answers => answers.actionType === 'init',
+    name: 'init.isAuth',
     type: 'confirm',
     message: 'Setup authentication (highly recommened)?',
     default: true,
   },
   {
-    when: answers => answers.isAuth == true,
-    name: `init.authIdField`,
+    when: answers => answers.actionType === 'init' && answers.init.isAuth === true,
+    name: 'init.authIdField',
     type: 'input',
     message: 'What is the id-key of your auth service?',
-    default: "id",
+    default: 'id',
   },
   {
-    when: answers => answers.isAuth == true,
-    name: `init.authUserService`,
+    when: answers => answers.actionType === 'init' && answers.init.isAuth === true,
+    name: 'init.authUserService',
     type: 'input',
     message: 'What is the name of your users-service for authentication?',
-    default: "users",
+    default: 'users',
   },
-  //#endregion
-  //#region generate service
+  // #endregion
+  // #region generate service
   {
-    when: answers => answers.actionType == "service",
-    name: "service.path",
-    type: "input",
-    message: "What is the name of the service?",
-    default: ""
+    when: answers => answers.actionType === 'service',
+    name: 'service.path',
+    type: 'input',
+    message: 'What is the name of the service?',
+    default: '',
   },
   {
-    when: answers => answers.actionType == "service",
-    name: "service.idField",
-    type: "input",
-    message: "What is the id-key of the service?",
-    default: "id"
+    when: answers => answers.actionType === 'service',
+    name: 'service.idField',
+    type: 'input',
+    message: 'What is the id-key of the service?',
+    default: 'id',
   },
   {
-    when: answers => answers.actionType == "service",
-    name: "service.feathersClientPath",
-    type: "input",
-    message: "Where is your feathers-client file located?",
-    default: "@/store/feathers-client.js"
+    when: answers => answers.actionType === 'service',
+    name: 'service.feathersClientPath',
+    type: 'input',
+    message: 'Where is your feathers-client file located?',
+    default: '@/store/feathers-client.js',
   },
   {
-    when: answers => answers.actionType == "service",
-    name: "service.instanceDefaults",
+    when: answers => answers.actionType === 'service',
+    name: 'service.instanceDefaults',
     type: 'list',
-    message: "Use instanceDefaults as function or object? (function recommended)",
+    message: 'Use instanceDefaults as function or object? (function recommended)',
     choices: [
-      { 
-        name: "function",
-        value: "fn"
+      {
+        name: 'function',
+        value: 'fn',
       }, {
-        name: "object",
-        value: "obj"
-      }
+        name: 'object',
+        value: 'obj',
+      },
     ],
     default: 0,
-  }
-  //#endregion
-];
+  },
+  // #endregion
+];