Merge pull request #6 from redvanworkshop/bug/5-sfcc-setup

Fixes #5

Author: manifestinteractive

commands/setup.js

@@ -3,10 +3,10 @@ const chalk = require('chalk')
 const fs = require('fs')
 const path = require('path')
 const prompt = require('prompt')
-const slug = require('slug')
 
 const builds = require('../lib/builds')
 const config = require('../lib/config')()
+const slug = require('../lib/slug')
 
 module.exports = async () => {
   const setDefaults =
@@ -117,8 +117,8 @@ module.exports = async () => {
           console.log(chalk.red('× ERROR:', err))
         }
       } else {
-        const client = slug(result.c, {lower: true, replacement: '-'})
-        const alias = slug(result.a, {lower: true, replacement: '-'})
+        const client = slug(result.c)
+        const alias = slug(result.a)
         const currentConfig = config.get()
 
         let newConfig = {}

lib/builds.js

@@ -2,7 +2,8 @@ const convert = require('xml-js')
 const fs = require('fs')
 const os = require('os').type()
 const path = require('path')
-const slug = require('slug')
+
+const slug = require('./slug')
 
 module.exports = project => {
   let externalToolBuilders = []
@@ -32,8 +33,7 @@ module.exports = project => {
       const name = slug(
         path.basename(path.dirname(path.dirname(launch))).replace('_', '-') +
           '_' +
-          path.basename(launch).replace('.launch', ''),
-        {lower: true, replacement: '-'}
+          path.basename(launch).replace('.launch', '')
       )
 
       // setup placeholder for this config file

lib/slug.js

@@ -0,0 +1,125 @@
+module.exports = text => {
+  text = text
+    .toString()
+    .toLowerCase()
+    .trim()
+
+  const sets = [
+    {
+      to: 'a',
+      from: '[ÀÁÂÃÄÅÆĀĂĄẠẢẤẦẨẪẬẮẰẲẴẶ]'
+    },
+    {
+      to: 'c',
+      from: '[ÇĆĈČ]'
+    },
+    {
+      to: 'd',
+      from: '[ÐĎĐÞ]'
+    },
+    {
+      to: 'e',
+      from: '[ÈÉÊËĒĔĖĘĚẸẺẼẾỀỂỄỆ]'
+    },
+    {
+      to: 'g',
+      from: '[ĜĞĢǴ]'
+    },
+    {
+      to: 'h',
+      from: '[ĤḦ]'
+    },
+    {
+      to: 'i',
+      from: '[ÌÍÎÏĨĪĮİỈỊ]'
+    },
+    {
+      to: 'j',
+      from: '[Ĵ]'
+    },
+    {
+      to: 'ij',
+      from: '[IJ]'
+    },
+    {
+      to: 'k',
+      from: '[Ķ]'
+    },
+    {
+      to: 'l',
+      from: '[ĹĻĽŁ]'
+    },
+    {
+      to: 'm',
+      from: '[Ḿ]'
+    },
+    {
+      to: 'n',
+      from: '[ÑŃŅŇ]'
+    },
+    {
+      to: 'o',
+      from: '[ÒÓÔÕÖØŌŎŐỌỎỐỒỔỖỘỚỜỞỠỢǪǬƠ]'
+    },
+    {
+      to: 'oe',
+      from: '[Œ]'
+    },
+    {
+      to: 'p',
+      from: '[ṕ]'
+    },
+    {
+      to: 'r',
+      from: '[ŔŖŘ]'
+    },
+    {
+      to: 's',
+      from: '[ߌŜŞŠ]'
+    },
+    {
+      to: 't',
+      from: '[ŢŤ]'
+    },
+    {
+      to: 'u',
+      from: '[ÙÚÛÜŨŪŬŮŰŲỤỦỨỪỬỮỰƯ]'
+    },
+    {
+      to: 'w',
+      from: '[ẂŴẀẄ]'
+    },
+    {
+      to: 'x',
+      from: '[ẍ]'
+    },
+    {
+      to: 'y',
+      from: '[ÝŶŸỲỴỶỸ]'
+    },
+    {
+      to: 'z',
+      from: '[ŹŻŽ]'
+    },
+    {
+      to: '-',
+      from: "[·/_,:;']"
+    }
+  ]
+
+  sets.forEach(set => {
+    text = text.replace(new RegExp(set.from, 'gi'), set.to)
+  })
+
+  text = text
+    .toString()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/&/g, '-and-')
+    .replace(/[^\w-]+/g, '')
+    .replace(/--+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '')
+
+  return text
+}

package-lock.json

@@ -51,8 +51,7 @@
     "husky": "^1.3.1",
     "lint-staged": "^8.1.0",
     "minimist": "^1.2.0",
-    "prettier": "^1.15.3",
-    "slug": "^0.9.3"
+    "prettier": "^1.15.3"
   },
   "dependencies": {
     "axios": "^0.18.0",