refactor: Group object-related utils under 📁Util/Objects

Redo of PR #3252. My git-fu is weak, and attempts to rebase and merge went fakakta

src/Data/TemplateData.js

@@ -5,15 +5,15 @@ import lodash from "@11ty/lodash-custom";
 import { TemplatePath, isPlainObject } from "@11ty/eleventy-utils";
 import debugUtil from "debug";
 
-import merge from "../Util/Merge.js";
-import unique from "../Util/Unique.js";
+import merge from "../Util/Objects/Merge.js";
+import unique from "../Util/Objects/Unique.js";
 import TemplateGlob from "../TemplateGlob.js";
 import EleventyExtensionMap from "../EleventyExtensionMap.js";
 import EleventyBaseError from "../Errors/EleventyBaseError.js";
 import TemplateDataInitialGlobalData from "./TemplateDataInitialGlobalData.js";
 import { getEleventyPackageJson, getWorkingProjectPackageJson } from "../Util/ImportJsonSync.js";
 import { EleventyImport, EleventyLoadContent } from "../Util/Require.js";
-import { DeepFreeze } from "../Util/DeepFreeze.js";
+import { DeepFreeze } from "../Util/Objects/DeepFreeze.js";
 
 const { set: lodashSet, get: lodashGet } = lodash;
 

src/EleventyServe.js

@@ -6,7 +6,7 @@ import debugUtil from "debug";
 import EleventyBaseError from "./Errors/EleventyBaseError.js";
 import ConsoleLogger from "./Util/ConsoleLogger.js";
 import PathPrefixer from "./Util/PathPrefixer.js";
-import merge, { DeepCopy } from "./Util/Merge.js";
+import merge, { DeepCopy } from "./Util/Objects/Merge.js";
 import checkPassthroughCopyBehavior from "./Util/PassthroughCopyBehaviorCheck.js";
 import { getModulePackageJson } from "./Util/ImportJsonSync.js";
 import { EleventyImport } from "./Util/Require.js";

src/Plugins/HtmlBasePlugin.js

@@ -1,6 +1,6 @@
 import urlFilter from "../Filters/Url.js";
 import PathPrefixer from "../Util/PathPrefixer.js";
-import { DeepCopy } from "../Util/Merge.js";
+import { DeepCopy } from "../Util/Objects/Merge.js";
 import { HtmlTransformer } from "../Util/HtmlTransformer.js";
 
 function isValidUrl(url) {

src/Plugins/I18nPlugin.js

@@ -1,7 +1,7 @@
 import { bcp47Normalize } from "bcp-47-normalize";
 import iso639 from "iso-639-1";
 
-import { DeepCopy } from "../Util/Merge.js";
+import { DeepCopy } from "../Util/Objects/Merge.js";
 
 // pathPrefix note:
 // When using `locale_url` filter with the `url` filter, `locale_url` must run first like

src/Plugins/Pagination.js

@@ -2,9 +2,9 @@ import { isPlainObject } from "@11ty/eleventy-utils";
 import lodash from "@11ty/lodash-custom";
 
 import EleventyBaseError from "../Errors/EleventyBaseError.js";
-import { DeepCopy } from "../Util/Merge.js";
-import { ProxyWrap } from "../Util/ProxyWrap.js";
-// import { DeepFreeze } from "../Util/DeepFreeze.js";
+import { DeepCopy } from "../Util/Objects/Merge.js";
+import { ProxyWrap } from "../Util/Objects/ProxyWrap.js";
+// import { DeepFreeze } from "../Util/Objects/DeepFreeze.js";
 import TemplateData from "../Data/TemplateData.js";
 
 const { set: lodashSet, get: lodashGet, chunk: lodashChunk } = lodash;

src/Plugins/RenderPlugin.js

@@ -7,8 +7,8 @@ const fsExists = util.promisify(fs.exists);
 
 // TODO add a first-class Markdown component to expose this using Markdown-only syntax (will need to be synchronous for markdown-it)
 
-import Merge from "../Util/Merge.js";
-import { ProxyWrap } from "../Util/ProxyWrap.js";
+import Merge from "../Util/Objects/Merge.js";
+import { ProxyWrap } from "../Util/Objects/ProxyWrap.js";
 import TemplateDataInitialGlobalData from "../Data/TemplateDataInitialGlobalData.js";
 import EleventyShortcodeError from "../Errors/EleventyShortcodeError.js";
 import TemplateRender from "../TemplateRender.js";

src/TemplateCollection.js

@@ -1,7 +1,7 @@
 import multimatch from "multimatch";
 import { TemplatePath } from "@11ty/eleventy-utils";
 
-import Sortable from "./Util/Sortable.js";
+import Sortable from "./Util/Objects/Sortable.js";
 import TemplateData from "./Data/TemplateData.js";
 
 class TemplateCollection extends Sortable {

src/TemplateConfig.js

@@ -8,7 +8,7 @@ import EleventyBaseError from "./Errors/EleventyBaseError.js";
 import UserConfig from "./UserConfig.js";
 import GlobalDependencyMap from "./GlobalDependencyMap.js";
 import ExistsCache from "./Util/ExistsCache.js";
-import merge from "./Util/Merge.js";
+import merge from "./Util/Objects/Merge.js";
 import eventBus from "./EventBus.js";
 import ProjectTemplateFormats from "./Util/ProjectTemplateFormats.js";
 

src/UserConfig.js

@@ -8,7 +8,7 @@ import EventEmitter from "./Util/AsyncEventEmitter.js";
 import EleventyCompatibility from "./Util/Compatibility.js";
 import EleventyBaseError from "./Errors/EleventyBaseError.js";
 import BenchmarkManager from "./Benchmark/BenchmarkManager.js";
-import { DeepCopy } from "./Util/Merge.js";
+import { DeepCopy } from "./Util/Objects/Merge.js";
 
 const debug = debugUtil("Eleventy:UserConfig");
 

test/LodashTest.js

@@ -1,7 +1,7 @@
 import test from "ava";
 import lodash from "@11ty/lodash-custom";
-import { ProxyWrap } from "../src/Util/ProxyWrap.js";
-import { DeepFreeze } from "../src/Util/DeepFreeze.js";
+import { ProxyWrap } from "../src/Util/Objects/ProxyWrap.js";
+import { DeepFreeze } from "../src/Util/Objects/DeepFreeze.js";
 
 const { set: lodashSet } = lodash;
 

test/MergeTest.js

@@ -1,6 +1,6 @@
 import test from "ava";
 
-import { default as Merge, DeepCopy } from "../src/Util/Merge.js";
+import { default as Merge, DeepCopy } from "../src/Util/Objects/Merge.js";
 
 test("Shallow Merge", (t) => {
   t.deepEqual(Merge({}, {}), {});

test/ProxyWrapTest.js

@@ -1,5 +1,5 @@
 import test from "ava";
-import { ProxyWrap } from "../src/Util/ProxyWrap.js";
+import { ProxyWrap } from "../src/Util/Objects/ProxyWrap.js";
 
 test("Basic wrap", (t) => {
   let test = ProxyWrap({}, { a: 1 });

test/SortableTest.js

@@ -1,7 +1,7 @@
 import test from "ava";
 import { DateTime } from "luxon";
 
-import Sortable from "../src/Util/Sortable.js";
+import Sortable from "../src/Util/Objects/Sortable.js";
 
 test("get Sort Function", (t) => {
   let s = new Sortable();

test/TemplateCollectionTest.js

@@ -2,7 +2,7 @@ import test from "ava";
 import multimatch from "multimatch";
 
 import Collection from "../src/TemplateCollection.js";
-import Sortable from "../src/Util/Sortable.js";
+import Sortable from "../src/Util/Objects/Sortable.js";
 
 import getNewTemplateForTests from "../test/_getNewTemplateForTests.js";
 import { getTemplateConfigInstance } from "./_testHelpers.js";