closer-cli 2.48.0 → 2.48.2

package/index.js

@@ -7,7 +7,7 @@ import yargs from 'yargs'
 import * as ImportData from './cmds/importData.js'
 import * as ImportMedia from './cmds/importMedia.js'
 
-console.log(chalk.bold(`\n 👜 Closer CLI (${pkg.version})\n`))
+console.log(chalk.bold(`\n👜 Closer CLI (${pkg.version})\n`))
 
 yargs(process.argv.slice(2))
   .scriptName('closer')
@@ -17,9 +17,9 @@ yargs(process.argv.slice(2))
     describe: 'Closer URL',
     demandOption: true
   })
-  .option('s', {
-    alias: 'secret',
-    describe: 'Closer Secret',
+  .option('k', {
+    alias: 'secret-key',
+    describe: 'Closer Secret Key',
     demandOption: true
   })
   .command(ImportData.command, ImportData.desc, ImportData.builder, ImportData.handler)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "closer-cli",
-  "version": "2.48.0",
+  "version": "2.48.2",
   "description": "",
   "exports": "./index.js",
   "type": "module",
@@ -12,20 +12,17 @@
   "author": "Francesco Pasqua <cesconix@me.com>",
   "license": "ISC",
   "dependencies": {
+    "axios": "^1.3.4",
     "chalk": "^5.1.2",
-    "csv-parse": "^5.3.1",
-    "csv-stringify": "^6.2.0",
     "del": "^7.0.0",
-    "event-stream": "^4.0.1",
+    "form-data": "^4.0.0",
     "got": "^12.5.2",
-    "mv": "^2.1.1",
     "ora": "^6.1.2",
     "prompts": "^2.4.2",
-    "require-directory": "^2.1.1",
-    "rimraf": "^3.0.2",
+    "qs": "^6.11.0",
     "slugify": "^1.6.3",
     "ws": "^8.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "0e7b7c7d9698c08d8541710cb6e304ecc096ee6d"
+  "gitHead": "1fbbcab302b63f3123c234824fb8784cd7f286f2"
 }

package/cmds/importData_cmds/multiple.js

@@ -1,341 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
-import { accessSync, constants, existsSync, mkdirSync } from 'fs'
-import path from 'path'
-import chalk from 'chalk'
-import prompts from 'prompts'
-import Ora from 'ora'
-import move from 'mv'
-import { promisify } from 'util'
-import { deleteAsync } from 'del'
-
-import {
-  getCsvFilesFromDir,
-  ALLOWED_CSV_FILES,
-  getGoogleSheetCsvUrl,
-  importCsvFromFile,
-  validateCsvFromFile,
-  refreshOrders,
-  download,
-  callBeforeDataImportProcess,
-  callAfterDataImportProcess,
-  getExecutionTime,
-  getArchiveFolder,
-  sendImportErrorMail,
-  deleteRowsBeforeImportDate,
-  readImportDir
-} from '../../helpers.js'
-
-const mv = promisify(move)
-
-export const command = 'multiple [options]'
-
-export const desc = 'Import different CSV files'
-
-export function builder(yargs) {
-  yargs
-    .usage(`Usage: ${chalk.cyan('$0 import:data multiple')} [options]`)
-    .option('fromDir', {
-      alias: 'd',
-      describe: 'Directory path that contains files to import',
-      type: 'string'
-    })
-    .option('fromGoogleDocId', {
-      alias: 'g',
-      describe: 'Google Doc ID that contains sheets to import',
-      type: 'string'
-    })
-    .conflicts('fromDir', 'fromGoogleDocId')
-    .check(argv => {
-      if (!argv.fromDir && !argv.fromGoogleDocId) {
-        throw new Error('Missing required argument: fromDir OR fromGoogleDocId')
-      }
-
-      if (argv.fromDir) {
-        accessSync(argv.fromDir, constants.F_OK)
-      }
-
-      return true
-    })
-}
-
-export async function handler(argv) {
-  // eslint-disable-next-line no-param-reassign
-  argv.out = argv.out || getArchiveFolder(argv.endpoint)
-
-  const spinner = new Ora()
-  const hrstart = process.hrtime()
-
-  const importProcess = {
-    importProcessStart: new Date(),
-    importProcessEnd: null,
-    time: null,
-    endpoint: argv.endpoint,
-    mode: null,
-    name: argv.name,
-    type: [],
-    result: []
-  }
-
-  const dirPathTemp = path.resolve(argv.out, `${importProcess.name}_temp`)
-  const dirPathFinal = path.resolve(argv.out, importProcess.name)
-  const dirPathOriginal = path.resolve(dirPathTemp, '_original')
-
-  const interactive = !argv.nonInteractive
-
-  const ws = {
-    endpoint: argv.endpoint,
-    secret: argv.secret
-  }
-
-  let csvChoices = []
-
-  if (argv.fromDir) {
-    const csvFilesFromDir = getCsvFilesFromDir(argv.fromDir)
-
-    csvChoices = Object.keys(ALLOWED_CSV_FILES).map(csvType => ({
-      title: ALLOWED_CSV_FILES[csvType],
-      csvType,
-      value: {
-        file: path.resolve(argv.fromDir, ALLOWED_CSV_FILES[csvType]),
-        csvType
-      },
-      disabled: !csvFilesFromDir.includes(ALLOWED_CSV_FILES[csvType])
-    }))
-  } else {
-    csvChoices = Object.keys(ALLOWED_CSV_FILES).map(csvType => ({
-      title: csvType,
-      csvType,
-      value: {
-        url: getGoogleSheetCsvUrl(argv.fromGoogleDocId, csvType),
-        csvType
-      }
-    }))
-  }
-
-  let files
-  if (interactive && !argv.type) {
-    const answers = await prompts(
-      [
-        {
-          instructions: false,
-          name: 'files',
-          type: 'multiselect',
-          message: argv.fromDir ? 'Select Files' : 'Select Sheets',
-          warn: argv.fromDir && 'File not found',
-          choices: csvChoices,
-          min: 1
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    files = answers.files
-  } else {
-    files = argv.type.map(type => {
-      const choice = csvChoices.find(csvChoice => csvChoice.csvType === type)
-      return choice.value
-    })
-  }
-
-  importProcess.type = files.map(f => f.csvType)
-
-  let mode
-  if (interactive && !argv.mode) {
-    const answers = await prompts(
-      [
-        {
-          type: 'select',
-          name: 'mode',
-          message: 'Import Mode',
-          choices: [
-            {
-              title: 'Incremental',
-              value: 'incremental'
-            },
-            {
-              title: 'Full',
-              description: 'Before starting, all database records will be logically deleted',
-              value: 'full'
-            }
-          ],
-          hint: ' '
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    mode = answers.mode
-  } else {
-    mode = argv.mode
-  }
-
-  importProcess.mode = mode
-
-  const validations = []
-  const csvReports = []
-
-  const parsedFiles = []
-
-  if (!existsSync(dirPathFinal) && !existsSync(dirPathOriginal)) {
-    mkdirSync(dirPathOriginal, { recursive: true })
-  } else {
-    console.log('')
-    console.log(`ERROR => directory "${dirPathFinal}" already exists, change the import name.`)
-    process.exit(1)
-  }
-
-  if (argv.fromGoogleDocId) {
-    console.log('')
-    spinner.start('Downloading Google sheets...')
-    for (const item of files) {
-      const filepath = await download(
-        item.url,
-        dirPathOriginal,
-        `${importProcess.name}_${item.csvType}.csv`
-      )
-      parsedFiles.push({ file: filepath, csvType: item.csvType })
-    }
-    spinner.succeed('Google sheets downloaded')
-  } else {
-    for (const file of files) {
-      const dst = path.resolve(dirPathOriginal, `${importProcess.name}_${file.csvType}.csv`)
-      await mv(file.file, dst)
-      parsedFiles.push({ file: dst, csvType: file.csvType })
-    }
-  }
-
-  //
-  // Validate CSV headers sequentially
-  //
-  for (const item of parsedFiles) {
-    const validation = await validateCsvFromFile(
-      item.file,
-      item.csvType,
-      ws,
-      argv.csvDelimiter,
-      importProcess
-    )
-    validations.push(validation)
-  }
-
-  const invalidFiles = validations.filter(v => v.error)
-  if (invalidFiles.length > 0) {
-    console.log('')
-    console.log(invalidFiles.map(f => `ERROR => [${chalk.red(f.inputFile)}] ${f.error}`).join('\n'))
-    process.exit(1)
-  }
-
-  if (interactive) {
-    console.log('')
-    const { confirmed } = await prompts(
-      [
-        {
-          type: 'confirm',
-          name: 'confirmed',
-          message: 'Continue?',
-          initial: false
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    if (!confirmed) {
-      process.exit()
-    }
-  }
-
-  console.log('')
-
-  //
-  // Call ImportService.beforeImportProcess (import flag)
-  //
-  if (!argv.skipTasksBeforeImport) {
-    try {
-      await callBeforeDataImportProcess(spinner, ws, importProcess)
-    } catch (e) {
-      process.exit(1)
-    }
-  }
-
-  //
-  // Import CSV files sequentially
-  //
-  const partitionsForCsvType = new Map()
-
-  for (const item of parsedFiles) {
-    const csvReport = await importCsvFromFile({
-      file: item.file,
-      csvType: item.csvType,
-      outputDir: dirPathTemp,
-      spinner,
-      ws,
-      delimiter: argv.csvDelimiter,
-      importProcess
-    })
-    csvReports.push(csvReport)
-    if (csvReport.countFailed > 0 || csvReport.countSkipped > 0) {
-      sendImportErrorMail(ws, importProcess, csvReport)
-    }
-    partitionsForCsvType.set(csvReport.csvType, Array.from(csvReport.partitions))
-  }
-
-  //
-  // Import FULL?
-  //
-  if (mode === 'full') {
-    await deleteRowsBeforeImportDate(
-      importProcess,
-      Object.fromEntries(partitionsForCsvType),
-      spinner,
-      ws
-    )
-  }
-
-  //
-  // Refresh Orders of type Draft, Template
-  //
-  // eslint-disable-next-line no-unused-vars
-  const refreshedOrders = await refreshOrders(spinner, ws, importProcess)
-
-  //
-  // importProcess
-  //
-
-  importProcess.importProcessEnd = new Date()
-  importProcess.time = getExecutionTime(hrstart)
-
-  const importProcessRows = []
-
-  csvReports.forEach(csvReport => {
-    importProcessRows.push({
-      type: 'import.csv',
-      payload: csvReport
-    })
-  })
-
-  importProcessRows.push({
-    type: 'refreshed.orders',
-    payload: refreshedOrders
-  })
-
-  importProcess.result = importProcessRows
-
-  await callAfterDataImportProcess(spinner, ws, importProcess)
-
-  await deleteAsync(path.resolve(dirPathTemp, '_processing'))
-
-  const reportFiles = await readImportDir(dirPathTemp)
-
-  for (const reportFile of reportFiles) {
-    const { filename, size } = reportFile
-    if ((filename.includes('skipped') || filename.includes('errors')) && size === 0) {
-      await deleteAsync(path.resolve(dirPathTemp, filename))
-    }
-  }
-
-  await mv(dirPathTemp, dirPathFinal)
-
-  process.exit()
-}

package/cmds/importData_cmds/single.js

@@ -1,281 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
-import { accessSync, constants, existsSync, mkdirSync } from 'fs'
-import path from 'path'
-import chalk from 'chalk'
-import prompts from 'prompts'
-import Ora from 'ora'
-import move from 'mv'
-import { promisify } from 'util'
-import { deleteAsync } from 'del'
-
-import {
-  ALLOWED_CSV_FILES,
-  importCsvFromFile,
-  validateCsvFromFile,
-  refreshOrders,
-  download,
-  callBeforeDataImportProcess,
-  callAfterDataImportProcess,
-  getExecutionTime,
-  getArchiveFolder,
-  sendImportErrorMail,
-  deleteRowsBeforeImportDate,
-  readImportDir
-} from '../../helpers.js'
-
-const mv = promisify(move)
-
-export const command = 'single [options]'
-
-export const desc = 'Import only one CSV file'
-
-export function builder(yargs) {
-  yargs
-    .usage(`Usage: ${chalk.cyan('$0 import:data single')} [options]`)
-    .option('fromFile', {
-      alias: 'f',
-      describe: 'File to import',
-      type: 'string'
-    })
-    .option('fromUrl', {
-      alias: 'u',
-      describe: 'Remote URL file to import',
-      type: 'string'
-    })
-    .conflicts('fromFile', 'fromUrl')
-    .check(argv => {
-      if (!argv.fromFile && !argv.fromUrl) {
-        throw new Error('Missing required argument: fromFile OR fromUrl')
-      }
-
-      if (argv.fromFile) {
-        accessSync(argv.fromFile, constants.F_OK)
-      }
-
-      return true
-    })
-}
-
-export async function handler(argv) {
-  // eslint-disable-next-line no-param-reassign
-  argv.out = argv.out || getArchiveFolder(argv.endpoint)
-
-  const spinner = new Ora()
-  const hrstart = process.hrtime()
-
-  const importProcess = {
-    importProcessStart: new Date(),
-    importProcessEnd: null,
-    time: null,
-    endpoint: argv.endpoint,
-    mode: null,
-    name: argv.name,
-    type: [],
-    result: []
-  }
-
-  const dirPathTemp = path.resolve(argv.out, `${importProcess.name}_temp`)
-  const dirPathFinal = path.resolve(argv.out, importProcess.name)
-  const dirPathOriginal = path.resolve(dirPathTemp, '_original')
-
-  const interactive = !argv.nonInteractive
-
-  const ws = {
-    endpoint: argv.endpoint,
-    secret: argv.secret
-  }
-
-  let type
-  if (interactive && !argv.type) {
-    const answers = await prompts(
-      [
-        {
-          instructions: false,
-          name: 'type',
-          type: 'select',
-          message: 'Select Type',
-          choices: Object.keys(ALLOWED_CSV_FILES).map(csvType => ({
-            title: csvType,
-            value: csvType
-          }))
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    type = answers.type
-  } else {
-    // eslint-disable-next-line prefer-destructuring
-    type = argv.type[0]
-  }
-
-  importProcess.type = [type]
-
-  let mode
-  if (interactive && !argv.mode) {
-    const answers = await prompts(
-      [
-        {
-          type: 'select',
-          name: 'mode',
-          message: 'Import Mode',
-          choices: [
-            {
-              title: 'Incremental',
-              value: 'incremental'
-            },
-            {
-              title: 'Full',
-              description: 'Before starting, all database records will be logically deleted',
-              value: 'full'
-            }
-          ],
-          hint: ' '
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    mode = answers.mode
-  } else {
-    mode = argv.mode
-  }
-
-  importProcess.mode = mode
-
-  if (!existsSync(dirPathFinal) && !existsSync(dirPathOriginal)) {
-    mkdirSync(dirPathOriginal, { recursive: true })
-  } else {
-    console.log('')
-    console.log(`ERROR => directory "${dirPathFinal}" already exists, change the import name.`)
-    process.exit(1)
-  }
-
-  if (interactive) {
-    console.log('')
-    const { confirmed } = await prompts(
-      [
-        {
-          type: 'confirm',
-          name: 'confirmed',
-          message: 'Continue?',
-          initial: false
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    if (!confirmed) {
-      process.exit()
-    }
-
-    console.log('')
-  }
-
-  let filepath = null
-
-  if (argv.fromUrl) {
-    spinner.start('Downloading file...')
-    filepath = await download(argv.fromUrl, dirPathOriginal, `${importProcess.name}_${type}.csv`)
-    spinner.succeed('Downloaded file')
-  }
-
-  if (argv.fromFile) {
-    filepath = path.resolve(dirPathOriginal, `${importProcess.name}_${type}.csv`)
-    await mv(argv.fromFile, filepath)
-  }
-
-  const validation = await validateCsvFromFile(filepath, type, ws, argv.csvDelimiter, importProcess)
-
-  if (validation.error) {
-    console.log(`ERROR => [${chalk.red(validation.inputFile)}] ${validation.error}`)
-    process.exit(1)
-  }
-
-  //
-  // Call ImportService.beforeImportProcess (import flag)
-  //
-  if (!argv.skipTasksBeforeImport) {
-    try {
-      await callBeforeDataImportProcess(spinner, ws, importProcess)
-    } catch (e) {
-      process.exit(1)
-    }
-  }
-
-  const partitionsForCsvType = new Map()
-
-  const csvReport = await importCsvFromFile({
-    file: filepath,
-    csvType: type,
-    outputDir: dirPathTemp,
-    spinner,
-    ws,
-    delimiter: argv.csvDelimiter,
-    importProcess
-  })
-
-  if (csvReport.countFailed > 0 || csvReport.countSkipped > 0) {
-    sendImportErrorMail(ws, importProcess, csvReport)
-  }
-
-  partitionsForCsvType.set(csvReport.csvType, Array.from(csvReport.partitions))
-
-  //
-  // Import FULL?
-  //
-  if (mode === 'full') {
-    await deleteRowsBeforeImportDate(
-      importProcess,
-      Object.fromEntries(partitionsForCsvType),
-      spinner,
-      ws
-    )
-  }
-
-  //
-  // Refresh Orders of type Draft, Template
-  //
-
-  const refreshedOrders = await refreshOrders(spinner, ws, importProcess)
-
-  //
-  // importProcess
-  //
-
-  importProcess.importProcessEnd = new Date()
-  importProcess.time = getExecutionTime(hrstart)
-
-  const importProcessRows = []
-
-  importProcessRows.push({
-    type: 'import.csv',
-    payload: csvReport
-  })
-
-  importProcessRows.push({
-    type: 'refreshed.orders',
-    payload: refreshedOrders
-  })
-
-  importProcess.result = importProcessRows
-
-  await callAfterDataImportProcess(spinner, ws, importProcess)
-
-  await deleteAsync(path.resolve(dirPathTemp, '_processing'))
-
-  const reportFiles = await readImportDir(dirPathTemp)
-
-  for (const reportFile of reportFiles) {
-    const { filename, size } = reportFile
-    if ((filename.includes('skipped') || filename.includes('errors')) && size === 0) {
-      await deleteAsync(path.resolve(dirPathTemp, filename))
-    }
-  }
-
-  await mv(dirPathTemp, dirPathFinal)
-
-  process.exit()
-}