chore(package upgrade): resolved vulnerabilities -- refactor

Author: ctafts

lib/bootstrap/__tests__/jsonToScript.spec.js

@@ -161,8 +161,8 @@ describe('jsonToScript', () => {
     }
   ]
 
-  it('generates description, up and down', () => {
-    const actual = jsonToScript(contentType, editorInterface)
+  it('generates description, up and down', async () => {
+    const actual = await jsonToScript(contentType, editorInterface)
     expect(actual).to.contain('module.exports.description = \'Create content model for Horse\'')
     expect(actual).to.contain('module.exports.up')
     expect(actual).to.contain('module.exports.down')

lib/bootstrap/generateScripts.js

@@ -21,16 +21,15 @@ const generateScripts = async (spaceId, environmentId, contentTypes, accessToken
     const contentTypesSet = new Set(contentTypes)
     requiredContentTypes = requiredContentTypes.filter(contentType => contentTypesSet.has(contentType.sys.id))
   }
-  const mapper = (contentType) => {
+  const mapper = async (contentType) => {
     const contentTypeId = contentType.sys.id
-    return environment.getEditorInterfaceForContentType(contentTypeId)
-      .then((editorInterface) => {
-        return createFile(
-          contentTypeId,
-          jsonToScript(contentType, editorInterface.controls),
-          migrationsDirectory
-        )
-      })
+    const editorInterface = await environment.getEditorInterfaceForContentType(contentTypeId)
+    const script = await jsonToScript(contentType, editorInterface.controls)
+    return createFile(
+      contentTypeId,
+      script,
+      migrationsDirectory
+    )
   }
 
   const files = await pMap(requiredContentTypes, mapper, { concurrency })

lib/bootstrap/jsonToScript.js

@@ -63,15 +63,16 @@ const restructureContentTypeJson = item => ({
   fields: item.fields.map(restructureFields)
 })
 
-const jsonToScript = (contentTypeJson, editorInterface) => {
+const jsonToScript = async (contentTypeJson, editorInterface) => {
   const restructuredJson = restructureContentTypeJson(contentTypeJson)
   const unformattedScript = createScript(restructuredJson, editorInterface)
-  const engine = new eslint.CLIEngine({
+  const engine = new eslint.ESLint({
     fix: true,
     baseConfig: { extends: ['eslint-config-standard'] },
     useEslintrc: false
   })
-  return engine.executeOnText(unformattedScript).results[0].output
+  const results = await engine.lintText(unformattedScript)
+  return results[0].output || unformattedScript
 }
 
 module.exports = {

lib/run.js

@@ -39,13 +39,13 @@ const run = async ({
   const client = createManagementClient(clientConfig)
 
   const makeRequest = (requestConfig) => {
-    const { url, ...config } = requestConfig
+    const { url, baseType, ...config } = requestConfig
     const parts = [
       'spaces', spaceId,
       'environments', environmentId,
       url.replace(/^\//, '') // Remove leading slash if present
     ]
-    const fullUrl = parts.filter(x => x !== '').join('/')
+    const fullUrl = `https://api.contentful.com/${parts.filter(x => x !== '').join('/')}`
     return client.raw.http(fullUrl, config)
   }
   const migrationParser = migrationParser1.default(makeRequest, clientConfig)

lib/store.js

@@ -87,7 +87,7 @@ class ContentfulStore {
     return {
       [this.locale]: {
         lastRun: set.lastRun,
-        migrations: migrations
+        migrations
       }
     }
   }