@symbo.ls/cli 2.11.375 → 2.11.378

package/bin/fetch.js

@@ -36,7 +36,7 @@ try {
 }
 
 export const fetchFromCli = async (opts) => {
-  const { dev, verbose, prettify, convert: convertOpt, metadata: metadataOpt, update } = opts
+  const { dev, verbose, prettify, convert: convertOpt, metadata: metadataOpt, update, force } = opts
   await rc.then(async (data) => {
     const { key, framework, distDir, metadata } = data
 
@@ -54,10 +54,18 @@ export const fetchFromCli = async (opts) => {
       }
     })
 
+    // console.log('ON FETCH:')
+    // console.log(body.components.Configuration)
+
     if (!body) return
 
     const { version, ...config } = body
 
+    if (body.designsystem) {
+      body.designSystem = body.designsystem
+      delete body.designsystem
+    }
+
     if (verbose) {
       if (key) {
         console.log(
@@ -90,33 +98,34 @@ export const fetchFromCli = async (opts) => {
       } else console.log(chalk.dim(t + ':'), chalk.bold(type))
     }
 
-    if (body.designsystem) {
-      body.designSystem = body.designsystem
-      delete body.designsystem
-    }
+    if (!distDir) {
+      const bodyString = JSON.stringify(body, null, prettify ?? 2)
 
-    const bodyString = JSON.stringify(body, null, prettify ?? 2)
+      try {
+        await fs.writeFileSync(LOCAL_CONFIG_PATH, bodyString)
 
-    try {
-      await fs.writeFileSync(LOCAL_CONFIG_PATH, bodyString)
+        if (verbose) {
+          console.log(chalk.dim('\ndynamic.json has been updated:'))
+          console.log(chalk.dim.underline(LOCAL_CONFIG_PATH))
+        }
 
-      if (verbose) {
-        console.log(chalk.dim('\ndynamic.json has been updated:'))
-        console.log(chalk.dim.underline(LOCAL_CONFIG_PATH))
+        console.log(chalk.bold.green('\nSuccessfully wrote file'))
+      } catch (e) {
+        console.log(chalk.bold.red('\nError writing file'))
+        if (verbose) console.error(e)
+        else console.log(debugMsg)
       }
 
-      console.log(chalk.bold.green('\nSuccessfully wrote file'))
-    } catch (e) {
-      console.log(chalk.bold.red('\nError writing file'))
-      if (verbose) console.error(e)
-      else console.log(debugMsg)
+      console.log()
+      console.warn('No --dist-dir option or "distDir" in symbols.json provided. Saving in ./node_modules/@symbo.ls/init/dynamic.json.')
+      return {}
     }
 
     if (body.components && convertOpt && framework) {
       convertFromCli(body.components, { ...opts, framework })
     }
 
-    if (update) {
+    if (update || force) {
       createFs(body, distDir, { update: true, metadata })
     } else {
       createFs(body, distDir, { metadata })
@@ -131,8 +140,10 @@ program
   .option('-v, --verbose', 'Verbose errors and warnings')
   .option('--convert', 'Verbose errors and warnings', true)
   .option('--metadata', 'Include metadata', false)
-  .option('--update', 'overriding changes from platform')
+  .option('--force', 'Force overriding changes from platform')
+  .option('--update', 'Overriding changes from platform')
   .option('--verbose-code', 'Verbose errors and warnings')
+  .option('--dist-dir', 'Directory to import files to.')
   .action(fetchFromCli)
 
 // program

package/bin/fs.js

@@ -5,17 +5,13 @@ import utils from '@domql/utils'
 import * as smblsUtils from '@symbo.ls/utils'
 import inquirer from 'inquirer'
 import { createPatch } from 'diff'
-import { fileURLToPath } from 'url'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const { removeChars, toCamelCase } = smblsUtils.default
-const { deepDestringify, objectToString, joinArrays, isString, removeValueFromArray } = utils
-
-const LOCAL_CONFIG_PATH = __dirname + '/symbols.json'
+const { deepDestringify, objectToString, joinArrays, isString, isObject, removeValueFromArray } = utils
 
 let singleFileKeys = ['designSystem', 'state', 'files']
-const keys = ['components', 'snippets', 'pages']
+const directoryKeys = ['components', 'snippets', 'pages']
+
 const defaultExports = ['pages', 'designSystem', 'state', 'files', 'schema']
 
 export async function createFs (
@@ -41,7 +37,7 @@ export async function createFs (
     await fs.promises.mkdir(targetDir, { recursive: true })
 
     const promises = [
-      ...keys.map((key) =>
+      ...directoryKeys.map((key) =>
         createKeyDirectoryAndFiles(key, body, targetDir, update)
       ),
       ...singleFileKeys.map((key) => {
@@ -57,15 +53,13 @@ export async function createFs (
     ]
 
     await Promise.all(promises)
-    await generateIndexjsFile(joinArrays(keys, singleFileKeys), targetDir, 'root')
-  }
-
-  if (filesExist) {
+    await generateIndexjsFile(joinArrays(directoryKeys, singleFileKeys), targetDir, 'root')
+  } else if (filesExist) {
     const cacheDir = path.join(distDir, '.cache')
     await fs.promises.mkdir(cacheDir, { recursive: true })
 
     const cachePromises = [
-      ...keys.map((key) =>
+      ...directoryKeys.map((key) =>
         createKeyDirectoryAndFiles(key, body, cacheDir, true)
       ),
       ...singleFileKeys.map((key) => {
@@ -76,7 +70,7 @@ export async function createFs (
     ]
 
     await Promise.all(cachePromises)
-    await generateIndexjsFile(joinArrays(keys, singleFileKeys), cacheDir, 'root')
+    await generateIndexjsFile(joinArrays(directoryKeys, singleFileKeys), cacheDir, 'root')
 
     const diffs = await findDiff(cacheDir, targetDir)
     if (diffs.length > 0) {
@@ -114,7 +108,7 @@ export async function createFs (
 
     const dirs = []
 
-    if (body[key] && typeof body[key] === 'object') {
+    if (body[key] && isObject(body[key])) {
       const promises = Object.entries(body[key]).map(
         async ([entryKey, value]) => {
           // if pages
@@ -134,7 +128,7 @@ export async function createFs (
   }
 
   async function createOrUpdateFile (dirPath, childKey, value, update) {
-    const cleanKey = childKey.includes('-') || childKey.includes('/') ? removeChars(toCamelCase(childKey)) : childKey
+    const itemKey = childKey.includes('-') || childKey.includes('/') ? removeChars(toCamelCase(childKey)) : childKey
     const filePath = path.join(dirPath, `${childKey.replace('/', '-')}.js`)
 
     if (!update && fs.existsSync(filePath)) {
@@ -143,10 +137,12 @@ export async function createFs (
 
     let stringifiedContent
     if (isString(value)) {
-      stringifiedContent = `export const ${cleanKey} = ${value}`
+      stringifiedContent = `export const ${itemKey} = ${value}`
     } else {
       const content = deepDestringify(value)
-      stringifiedContent = `export const ${cleanKey} = ${objectToString(content)};`
+      // console.log('ON DEEPDESTR:')
+      // console.log(content.components.Configuration)
+      stringifiedContent = `export const ${itemKey} = ${objectToString(content)};`
     }
 
     await fs.promises.writeFile(filePath, stringifiedContent, 'utf8')
@@ -183,14 +179,12 @@ export async function createFs (
 
   // fs.writeFileSync(destPath, genStr)
   // }
-
-  await fs.writeFileSync(LOCAL_CONFIG_PATH, '{}')
 }
 
 async function findDiff (targetDir, distDir) {
   const diffs = []
 
-  for (const key of keys) {
+  for (const key of directoryKeys) {
     const targetDirPath = path.join(targetDir, key)
     const distDirPath = path.join(distDir, key)
 
@@ -288,7 +282,7 @@ async function generateIndexjsFile (dirs, dirPath, key) {
 }
 
 async function overrideFiles (targetDir, distDir) {
-  for (const key of keys) {
+  for (const key of directoryKeys) {
     const targetDirPath = path.join(targetDir, key)
     const distDirPath = path.join(distDir, key)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.11.375",
+  "version": "2.11.378",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -26,5 +26,5 @@
     "node-fetch": "^3.1.0",
     "v8-compile-cache": "^2.3.0"
   },
-  "gitHead": "4fddad68b778dbfd8298ac6ca8d500bdabbb2282"
+  "gitHead": "52bd85217084c8bbfa6222526edb36930ce7106d"
 }