@vnejs/build 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/build",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Build tools for @vnejs",
   "main": "src/index.js",
   "bin": {

package/src/data/index.js

@@ -12,7 +12,7 @@ const buildDataFunc = (gameDir, distDir) => {
 
     result = merge(result, newData);
 
-    fs.writeFileSync(path.join(distDir, `media.${modDir}.json`), JSON.stringify(newData.data.media));
+    newData.data.media && fs.writeFileSync(path.join(distDir, `media.${modDir}.json`), JSON.stringify(newData.data.media));
   });
 
   Object.keys(result.label).forEach((label) => fs.writeFileSync(path.join(distDir, `label.${label}.json`), JSON.stringify(result.label[label])));

package/src/data/utils.js

@@ -50,16 +50,18 @@ const parseLines = (lines) => {
     .forEach((line) => {
       if (keyReg.test(line)) {
         const { key } = line.match(keyReg).groups;
-        return curKeys.push({ key, indent: line.length - line.trim().length });
+        const indent = line.length - line.trim().length;
+
+        if (curKeys.length && curKeys[curKeys.length - 1].indent >= indent) curKeys = curKeys.filter((k) => indent < k.indent);
+
+        return curKeys.push({ key, indent });
       } else if (keyValueReg.test(line)) {
         const { key, value } = line.match(keyValueReg).groups;
 
         curKeys = curKeys.filter(({ indent } = {}) => indent < line.length - line.trim().length);
 
         const args = curKeys.reduce((acc, { key }) => {
-          if (!acc[key]) {
-            acc[key] = {};
-          }
+          if (!acc[key]) acc[key] = {};
           return acc[key];
         }, realLines[realLines.length - 1].args);
 
@@ -67,11 +69,7 @@ const parseLines = (lines) => {
       } else {
         curKeys = [];
         const realLine = line.trim();
-        realLines.push({
-          line: realLine,
-          indent: line.length - realLine.length,
-          args: {},
-        });
+        realLines.push({ line: realLine, indent: line.length - realLine.length, args: {} });
       }
     });
 
@@ -117,8 +115,6 @@ const runBuildData = ({ modDir } = {}) => {
       curLine++;
     }
 
-    // fs.writeFileSync(path.join(rootDir, "dist", "data.json"), JSON.stringify({ media }));
-
     let curLabel2 = null;
 
     const kek = lines.reduce((acc, line) => {
@@ -137,11 +133,7 @@ const runBuildData = ({ modDir } = {}) => {
     }, {});
 
     Object.keys(kek).map(async (label) => {
-      const minIndent = kek[label].reduce(
-        (acc, k) => Math.min(acc, k.length ? k.length - k.trim().length : 9999),
-        9999
-      );
-      // const maxIndent = kek[label].reduce((acc, k) => Math.max(acc, k.length - k.trim().length), -9999);
+      const minIndent = kek[label].reduce((acc, k) => Math.min(acc, k.length ? k.length - k.trim().length : 9999), 9999);
       const lines = kek[label].map((a) => a.slice(minIndent)).filter(Boolean);
       result.label[label] = { lines: parseLines(lines) };
     });