@symbo.ls/cli 2.11.375 → 2.11.384

package/bin/fetch.js

@@ -8,7 +8,7 @@ import * as fetch from '@symbo.ls/fetch'
 import * as utils from '@domql/utils'
 import { convertFromCli } from './convert.js'
 import { createFs } from './fs.js'
-
+import { fs2js } from './fs2.js'
 const { isObjectLike } = utils.default
 const { fetchRemote } = fetch.default
 
@@ -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,11 +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
-//   .command("push")
-//   .description("Push changes to platform")
-//   .action(fetchFromCli({ cache: true }));
+program.command('push').description('Push changes to platform').action(fs2js)

package/bin/fs.js

@@ -5,17 +5,20 @@ 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 +44,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) => {
@@ -53,11 +56,16 @@ export async function createFs (
             update
           )
         }
+        return undefined
       })
     ]
 
     await Promise.all(promises)
-    await generateIndexjsFile(joinArrays(keys, singleFileKeys), targetDir, 'root')
+    await generateIndexjsFile(
+      joinArrays(singleFileKeys, directoryKeys),
+      targetDir,
+      'root'
+    )
   }
 
   if (filesExist) {
@@ -65,18 +73,23 @@ export async function createFs (
     await fs.promises.mkdir(cacheDir, { recursive: true })
 
     const cachePromises = [
-      ...keys.map((key) =>
+      ...directoryKeys.map((key) =>
         createKeyDirectoryAndFiles(key, body, cacheDir, true)
       ),
       ...singleFileKeys.map((key) => {
         if (body[key] && typeof body[key] === 'object') {
           return createSingleFileFolderAndFile(key, body[key], cacheDir, true)
         }
+        return undefined
       })
     ]
 
     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 +127,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 +147,10 @@ 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 +159,14 @@ 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 +203,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)
 
@@ -218,10 +236,7 @@ async function findDiff (targetDir, distDir) {
         continue
       }
 
-      const targetContent = await fs.promises.readFile(
-        targetFilePath,
-        'utf8'
-      )
+      const targetContent = await fs.promises.readFile(targetFilePath, 'utf8')
       const distContent = await fs.promises.readFile(distFilePath, 'utf8')
 
       if (targetContent !== distContent) {
@@ -269,26 +284,49 @@ async function generateIndexjsFile (dirs, dirPath, key) {
   let indexContent
   if (key === 'pages') {
     indexContent =
-    dirs.map((d) => `import { ${d.includes('-') || d.includes('/') ? removeChars(toCamelCase(d)) : d} } from './${d.replace('/', '-')}';`).join('\n') + '\n' +
-    `export default {
-      ${dirs.map((d) => `'/${d === 'main' ? '' : d}': ${d.includes('-') || d.includes('/') ? removeChars(toCamelCase(d)) : d},`).join('\n') + '\n'}
+      dirs
+        .map(
+          (d) =>
+            `import { ${
+              d.includes('-') || d.includes('/')
+                ? removeChars(toCamelCase(d))
+                : d
+            } } from './${d.replace('/', '-')}';`
+        )
+        .join('\n') +
+      '\n' +
+      `export default {
+      ${
+        dirs
+          .map(
+            (d) =>
+              `'/${d === 'main' ? '' : d}': ${
+                d.includes('-') || d.includes('/')
+                  ? removeChars(toCamelCase(d))
+                  : d
+              },`
+          )
+          .join('\n') + '\n'
+      }
     }`
   } else if (key === 'root') {
     indexContent =
-    dirs.map((d) => {
-      if (defaultExports.includes(d)) return `export { default as ${d} } from './${d}';`
-      else return `export * as ${d} from './${d}';`
-    }).join('\n') + '\n'
+      dirs
+        .map((d) => {
+          if (defaultExports.includes(d)) {
+            return `export { default as ${d} } from './${d}';`
+          } else return `export * as ${d} from './${d}';`
+        })
+        .join('\n') + '\n'
   } else {
-    indexContent =
-    dirs.map((d) => `export * from './${d}';`).join('\n') + '\n'
+    indexContent = dirs.map((d) => `export * from './${d}';`).join('\n') + '\n'
   }
   const indexFilePath = path.join(dirPath, 'index.js')
   await fs.promises.writeFile(indexFilePath, indexContent, 'utf8')
 }
 
 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/bin/fs2.js

@@ -0,0 +1,85 @@
+import fs from 'fs'
+import path from 'path'
+import { build } from 'esbuild'
+import { loadModule } from './require.js'
+
+const RC_PATH = process.cwd() + '/symbols.json'
+
+let rc = {}
+try {
+  rc = loadModule(RC_PATH); // eslint-disable-line
+} catch (e) {
+  console.error('Please include symbols.json to your root of respository')
+}
+
+export async function fs2js () {
+  const directoryPath = './toko'
+  const outputDirectory = './toko/dist'
+  buildDirectory(directoryPath, outputDirectory)
+    .then(() => {
+      console.log('All files built successfully')
+    })
+    .catch((error) => {
+      console.error('Error:', error)
+    })
+  const kleo = await import(process.cwd() + '/toko/dist/index.js')
+  console.log(JSON.stringify(kleo))
+}
+
+async function buildDirectory (directoryPath, outputDirectory) {
+  try {
+    const files = await getFilesRecursively(directoryPath)
+    const buildPromises = files.map(async (filePath) => {
+      const relativePath = path.relative(directoryPath, filePath)
+      const outputFile = path.join(outputDirectory, relativePath)
+      await buildFromFile(filePath, outputFile)
+    })
+    await Promise.all(buildPromises)
+    console.log('All files built successfully')
+  } catch (error) {
+    console.error('Error building directory:', error)
+    throw error
+  }
+}
+
+async function buildFromFile (inputFilePath, outputFilePath) {
+  try {
+    const fileContents = await fs.readFileSync(inputFilePath, 'utf8')
+    await build({
+      stdin: {
+        contents: fileContents,
+        sourcefile: inputFilePath,
+        loader: 'js',
+        resolveDir: path.dirname(inputFilePath)
+      },
+      minify: false,
+      outfile: outputFilePath,
+      target: 'node14',
+      platform: 'node',
+      format: 'cjs'
+    })
+  } catch (error) {
+    console.error('Error building file:', error)
+    throw error
+  }
+}
+
+async function getFilesRecursively (directoryPath) {
+  const files = []
+  async function traverseDirectory (currentPath) {
+    const entries = await fs.readdirSync(currentPath, { withFileTypes: true })
+    for (const entry of entries) {
+      if (entry.name.startsWith('dist')) {
+        continue
+      }
+      const fullPath = path.join(currentPath, entry.name)
+      if (entry.isDirectory()) {
+        await traverseDirectory(fullPath)
+      } else if (entry.isFile() && entry.name.endsWith('.js')) {
+        files.push(fullPath)
+      }
+    }
+  }
+  await traverseDirectory(directoryPath)
+  return files
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.11.375",
+  "version": "2.11.384",
   "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": "0832ae608bf20ab45b988331e1b4bb88b4e449ba"
 }