@symbo.ls/cli 2.11.378 → 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
 
@@ -146,7 +146,4 @@ program
   .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

@@ -7,7 +7,14 @@ import inquirer from 'inquirer'
 import { createPatch } from 'diff'
 
 const { removeChars, toCamelCase } = smblsUtils.default
-const { deepDestringify, objectToString, joinArrays, isString, isObject, removeValueFromArray } = utils
+const {
+  deepDestringify,
+  objectToString,
+  joinArrays,
+  isString,
+  isObject,
+  removeValueFromArray
+} = utils
 
 let singleFileKeys = ['designSystem', 'state', 'files']
 const directoryKeys = ['components', 'snippets', 'pages']
@@ -49,12 +56,19 @@ export async function createFs (
             update
           )
         }
+        return undefined
       })
     ]
 
     await Promise.all(promises)
-    await generateIndexjsFile(joinArrays(directoryKeys, singleFileKeys), targetDir, 'root')
-  } else if (filesExist) {
+    await generateIndexjsFile(
+      joinArrays(singleFileKeys, directoryKeys),
+      targetDir,
+      'root'
+    )
+  }
+
+  if (filesExist) {
     const cacheDir = path.join(distDir, '.cache')
     await fs.promises.mkdir(cacheDir, { recursive: true })
 
@@ -66,11 +80,16 @@ export async function createFs (
         if (body[key] && typeof body[key] === 'object') {
           return createSingleFileFolderAndFile(key, body[key], cacheDir, true)
         }
+        return undefined
       })
     ]
 
     await Promise.all(cachePromises)
-    await generateIndexjsFile(joinArrays(directoryKeys, singleFileKeys), cacheDir, 'root')
+    await generateIndexjsFile(
+      joinArrays(directoryKeys, singleFileKeys),
+      cacheDir,
+      'root'
+    )
 
     const diffs = await findDiff(cacheDir, targetDir)
     if (diffs.length > 0) {
@@ -128,7 +147,10 @@ export async function createFs (
   }
 
   async function createOrUpdateFile (dirPath, childKey, value, update) {
-    const itemKey = 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)) {
@@ -142,7 +164,9 @@ export async function createFs (
       const content = deepDestringify(value)
       // console.log('ON DEEPDESTR:')
       // console.log(content.components.Configuration)
-      stringifiedContent = `export const ${itemKey} = ${objectToString(content)};`
+      stringifiedContent = `export const ${itemKey} = ${objectToString(
+        content
+      )};`
     }
 
     await fs.promises.writeFile(filePath, stringifiedContent, 'utf8')
@@ -212,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) {
@@ -263,19 +284,42 @@ 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')

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.378",
+  "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": "52bd85217084c8bbfa6222526edb36930ce7106d"
+  "gitHead": "0832ae608bf20ab45b988331e1b4bb88b4e449ba"
 }