revert: transform object with numeric keys (#466)

This reverts commit 9ef4da1.

Author: mathio

.changeset/beige-lies-wave.md

@@ -0,0 +1,5 @@
+---
+"lingo.dev": patch
+---
+
+revert

packages/cli/package.json

@@ -37,7 +37,6 @@
     "dev": "tsup --watch",
     "build": "tsc --noEmit && tsup",
     "test": "vitest run",
-    "test:watch": "vitest",
     "clean": "rm -rf build"
   },
   "keywords": [],

packages/cli/src/cli/loaders/flat.spec.ts

@@ -1,88 +1,24 @@
 import { flatten, unflatten } from "flat";
 import { ILoader } from "./_types";
 import { createLoader } from "./_utils";
-import _ from "lodash";
-
-export const OBJECT_NUMERIC_KEY_PREFIX = "__lingodotdev__obj__";
 
 export default function createFlatLoader(): ILoader<Record<string, any>, Record<string, string>> {
-  let denormalizedKeysMap: Record<string, string>;
-
   return createLoader({
     pull: async (locale, input) => {
-      const denormalized = denormalizeObjectKeys(input || {});
-      const flattened: Record<string, string> = flatten(denormalized, {
+      return flatten(input || {}, {
         delimiter: "/",
         transformKey(key) {
           return encodeURIComponent(String(key));
         },
       });
-      denormalizedKeysMap = buildDenormalizedKeysMap(flattened);
-      const normalized = normalizeObjectKeys(flattened);
-      return normalized;
     },
     push: async (locale, data) => {
-      const denormalized = mapDeormalizedKeys(data, denormalizedKeysMap);
-      const unflattened: Record<string, any> = unflatten(denormalized || {}, {
+      return unflatten(data || {}, {
         delimiter: "/",
         transformKey(key) {
           return decodeURIComponent(String(key));
         },
       });
-      const normalized = normalizeObjectKeys(unflattened);
-      return normalized;
     },
   });
 }
-
-export function buildDenormalizedKeysMap(obj: Record<string, string>) {
-  return Object.keys(obj).reduce(
-    (acc, key) => {
-      const normalizedKey = `${key}`.replace(OBJECT_NUMERIC_KEY_PREFIX, "");
-      acc[normalizedKey] = key;
-      return acc;
-    },
-    {} as Record<string, string>,
-  );
-}
-
-export function mapDeormalizedKeys(obj: Record<string, any>, denormalizedKeysMap: Record<string, string>) {
-  return Object.keys(obj).reduce(
-    (acc, key) => {
-      const denormalizedKey = denormalizedKeysMap[key];
-      acc[denormalizedKey] = obj[key];
-      return acc;
-    },
-    {} as Record<string, string>,
-  );
-}
-
-export function denormalizeObjectKeys(obj: Record<string, any>): Record<string, any> {
-  if (_.isObject(obj) && !_.isArray(obj)) {
-    return _.transform(
-      obj,
-      (result, value, key) => {
-        const newKey = !isNaN(Number(key)) ? `${OBJECT_NUMERIC_KEY_PREFIX}${key}` : key;
-        result[newKey] = _.isObject(value) ? denormalizeObjectKeys(value) : value;
-      },
-      {} as Record<string, any>,
-    );
-  } else {
-    return obj;
-  }
-}
-
-export function normalizeObjectKeys(obj: Record<string, any>): Record<string, any> {
-  if (_.isObject(obj) && !_.isArray(obj)) {
-    return _.transform(
-      obj,
-      (result, value, key) => {
-        const newKey = `${key}`.replace(OBJECT_NUMERIC_KEY_PREFIX, "");
-        result[newKey] = _.isObject(value) ? normalizeObjectKeys(value) : value;
-      },
-      {} as Record<string, any>,
-    );
-  } else {
-    return obj;
-  }
-}

packages/cli/src/cli/loaders/flat.ts

@@ -332,42 +332,6 @@ describe("bucket loaders", () => {
 
       expect(fs.writeFile).toHaveBeenCalledWith("i18n/es.json", expectedOutput, { encoding: "utf-8", flag: "w" });
     });
-
-    it("should save json data with numeric keys", async () => {
-      setupFileMocks();
-
-      const input = { messages: { "1": "foo", "2": "bar", "3": "bar" } };
-      const payload = { "messages/1": "foo", "messages/2": "bar", "messages/3": "bar" };
-      const expectedOutput = JSON.stringify(input, null, 2);
-
-      mockFileOperations(JSON.stringify(input));
-
-      const jsonLoader = createBucketLoader("json", "i18n/[locale].json");
-      jsonLoader.setDefaultLocale("en");
-      await jsonLoader.pull("en");
-
-      await jsonLoader.push("es", payload);
-
-      expect(fs.writeFile).toHaveBeenCalledWith("i18n/es.json", expectedOutput, { encoding: "utf-8", flag: "w" });
-    });
-
-    it("should save json data with array", async () => {
-      setupFileMocks();
-
-      const input = { messages: ["foo", "bar"] };
-      const payload = { "messages/0": "foo", "messages/1": "bar" };
-      const expectedOutput = `{\n  "messages\": [\"foo\", \"bar\"]\n}`;
-
-      mockFileOperations(JSON.stringify(input));
-
-      const jsonLoader = createBucketLoader("json", "i18n/[locale].json");
-      jsonLoader.setDefaultLocale("en");
-      await jsonLoader.pull("en");
-
-      await jsonLoader.push("es", payload);
-
-      expect(fs.writeFile).toHaveBeenCalledWith("i18n/es.json", expectedOutput, { encoding: "utf-8", flag: "w" });
-    });
   });
 
   describe("markdown bucket loader", () => {