Add support for nested folders

NEARBuilders · Aug 4, 2024 · 2b02aea · 2b02aea
1 parent c369538
commit 2b02aea
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/examples/single/bos.config.json b/examples/single/bos.config.json
@@ -8,5 +8,8 @@
       "aliases": ["./aliases.testnet.json"],
       "index": "quickstart.testnet/widget/home"
     }
+  },
+  "data": {
+    "include": ["test", "test1"]
   }
 }
diff --git a/examples/single/test/nestedTest/nestedTest.json b/examples/single/test/nestedTest/nestedTest.json
@@ -0,0 +1,3 @@
+{
+  "data": "this is a nested folder"
+}
diff --git a/lib/deploy.ts b/lib/deploy.ts
@@ -5,7 +5,7 @@ import fs from "fs";
 import { buildApp } from "@/lib/build";
 import { readConfig } from "@/lib/config";
 import { Network } from "@/lib/types";
-import { move, pathExists, readdir, remove } from "@/lib/utils/fs";
+import { move, pathExists, processDirectory, readdir, remove } from "@/lib/utils/fs";
 import { readWorkspace } from "@/lib/workspace";
 import { SOCIAL_CONTRACT } from './server';
 
@@ -191,16 +191,7 @@ export async function deployAppDataFolders(appName: string, opts: DeployOptions)
 
   for (const folder of config.data.include) {
     try {
-      const files = await fs.readdirSync(folder);
-
-      for (const file of files) {
-        const filePath = path.join(folder, file);
-        const fileContent = await fs.readFileSync(filePath, 'utf8');
-        const jsonContent = JSON.parse(fileContent);
-
-        const key = path.basename(file, '.json');
-        result[key] = jsonContent;
-      }
+      await processDirectory(folder, result);
     } catch (error) {
       console.error(`Error processing folder ${folder}:`, error);
     }

diff --git a/lib/utils/fs.ts b/lib/utils/fs.ts
@@ -1,4 +1,5 @@
 import { copy, ensureDir, move, outputFile, pathExists, readdir, readFile, readJson, remove, writeJson, existsSync, promises } from 'fs-extra';
+import { readdirSync, readFileSync } from 'fs';
 import path from 'path';
 
 async function loopThroughFiles(pwd: string, callback: (file: string) => Promise<void>) {
@@ -16,4 +17,24 @@ async function loopThroughFiles(pwd: string, callback: (file: string) => Promise
   }
 }
 
-export { copy, ensureDir, loopThroughFiles, move, outputFile, pathExists, readdir, readFile, readJson, remove, writeJson, existsSync, promises };
+async function processDirectory(dir, result) {
+  const files = await readdirSync(dir, { withFileTypes: true });
+  for (const file of files) {
+    const filePath = path.join(dir, file.name);
+    if (file.isDirectory()) {
+      await processDirectory(filePath, result);
+    } else if (path.extname(file.name).toLowerCase() === '.json') {
+      try {
+        const fileContent = await readFileSync(filePath, 'utf8');
+        const jsonContent = JSON.parse(fileContent);
+        const relativePath = path.relative(process.cwd(), filePath);
+        const key = path.dirname(relativePath) + '/' + path.basename(file.name, '.json');
+        result[key] = jsonContent;
+      } catch (error) {
+        console.error(`Error processing file ${filePath}:`, error);
+      }
+    }
+  }
+}
+
+export { copy, ensureDir, loopThroughFiles, move, outputFile, pathExists, readdir, readFile, readJson, remove, writeJson, existsSync, promises, processDirectory };