appwrite-utils-cli 0.10.81 → 0.10.82

package/README.md

@@ -150,6 +150,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.82: Fixed the `lodash` import, replaced with `es-toolkit`
 - 0.10.81: Fixed `wipeCollection` -- it wasn't properly deleting all files in a loop
 - 0.10.80: Updated `appwrite-utils` req
 - 0.10.78: Fixed `attributesSame` so it will properly update attributes that have changed

package/dist/collections/methods.js

@@ -2,46 +2,46 @@ import { Client, Databases, ID, Permission, Query, } from "node-appwrite";
 import { nameToIdMapping, processQueue } from "../migrations/queue.js";
 import { createUpdateCollectionAttributes } from "./attributes.js";
 import { createOrUpdateIndexes } from "./indexes.js";
-import _, { initial } from "lodash";
 import { SchemaGenerator } from "../migrations/schemaStrings.js";
+import { isNull, isUndefined, isNil, isPlainObject, isString, isJSONValue, } from "es-toolkit";
 import { delay, tryAwaitWithRetry } from "../utils/helperFunctions.js";
 export const documentExists = async (db, dbId, targetCollectionId, toCreateObject) => {
-    // Had to do this because kept running into issues with type checking arrays so, sorry 40ms
     const collection = await db.getCollection(dbId, targetCollectionId);
     const attributes = collection.attributes;
     let arrayTypeAttributes = attributes
         .filter((attribute) => attribute.array === true)
         .map((attribute) => attribute.key);
-    // Function to check if a string is JSON
     const isJsonString = (str) => {
         try {
             const json = JSON.parse(str);
-            return typeof json === "object" && json !== null; // Check if parsed JSON is an object or array
+            return typeof json === "object" && json !== null;
         }
         catch (e) {
             return false;
         }
     };
-    // Validate and prepare query parameters
-    const validQueryParams = _.chain(toCreateObject)
-        .pickBy((value, key) => !arrayTypeAttributes.includes(key) &&
+    // Convert object to entries and filter
+    const validEntries = Object.entries(toCreateObject).filter(([key, value]) => !arrayTypeAttributes.includes(key) &&
         !key.startsWith("$") &&
-        !_.isNull(value) &&
-        !_.isUndefined(value) &&
-        !_.isEmpty(value) &&
-        !_.isObject(value) && // Keeps excluding objects
-        !_.isArray(value) && // Explicitly exclude arrays
-        !(_.isString(value) && isJsonString(value)) && // Exclude JSON strings
-        (_.isString(value) ? value.length < 4096 && value.length > 0 : true) // String length check
-    )
-        .mapValues((value, key) => _.isString(value) || _.isNumber(value) || _.isBoolean(value)
-        ? value
-        : null)
-        .omitBy(_.isNull) // Remove any null values that might have been added in mapValues
-        .toPairs()
-        .slice(0, 25) // Limit to 25 to adhere to query limit
-        .map(([key, value]) => Query.equal(key, value))
-        .value();
+        !isNull(value) &&
+        !isUndefined(value) &&
+        !isNil(value) &&
+        !isPlainObject(value) &&
+        !Array.isArray(value) &&
+        !(isString(value) && isJsonString(value)) &&
+        (isString(value) ? value.length < 4096 && value.length > 0 : true));
+    // Map and filter valid entries
+    const validMappedEntries = validEntries
+        .map(([key, value]) => [
+        key,
+        isString(value) || typeof value === "number" || typeof value === "boolean"
+            ? value
+            : null,
+    ])
+        .filter(([key, value]) => !isNull(value) && isString(key))
+        .slice(0, 25);
+    // Convert to Query parameters
+    const validQueryParams = validMappedEntries.map(([key, value]) => Query.equal(key, value));
     // Execute the query with the validated and prepared parameters
     const result = await db.listDocuments(dbId, targetCollectionId, validQueryParams);
     return result.documents[0] || null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.10.81",
+  "version": "0.10.82",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -35,10 +35,10 @@
     "chalk": "^5.3.0",
     "cli-progress": "^3.12.0",
     "commander": "^12.1.0",
+    "es-toolkit": "^1.32.0",
     "ignore": "^6.0.2",
     "inquirer": "^9.3.6",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
     "luxon": "^3.5.0",
     "nanostores": "^0.10.3",
     "node-appwrite": "^14.1.0",

package/src/collections/methods.ts

@@ -10,8 +10,15 @@ import type { AppwriteConfig, CollectionCreate, Indexes } from "appwrite-utils";
 import { nameToIdMapping, processQueue } from "../migrations/queue.js";
 import { createUpdateCollectionAttributes } from "./attributes.js";
 import { createOrUpdateIndexes } from "./indexes.js";
-import _, { initial } from "lodash";
 import { SchemaGenerator } from "../migrations/schemaStrings.js";
+import {
+  isNull,
+  isUndefined,
+  isNil,
+  isPlainObject,
+  isString,
+  isJSONValue,
+} from "es-toolkit";
 import { delay, tryAwaitWithRetry } from "../utils/helperFunctions.js";
 
 export const documentExists = async (
@@ -20,46 +27,50 @@ export const documentExists = async (
   targetCollectionId: string,
   toCreateObject: any
 ): Promise<Models.Document | null> => {
-  // Had to do this because kept running into issues with type checking arrays so, sorry 40ms
   const collection = await db.getCollection(dbId, targetCollectionId);
   const attributes = collection.attributes as any[];
   let arrayTypeAttributes = attributes
     .filter((attribute: any) => attribute.array === true)
     .map((attribute: any) => attribute.key);
-  // Function to check if a string is JSON
+
   const isJsonString = (str: string) => {
     try {
       const json = JSON.parse(str);
-      return typeof json === "object" && json !== null; // Check if parsed JSON is an object or array
+      return typeof json === "object" && json !== null;
     } catch (e) {
       return false;
     }
   };
 
-  // Validate and prepare query parameters
-  const validQueryParams = _.chain(toCreateObject)
-    .pickBy(
-      (value, key) =>
-        !arrayTypeAttributes.includes(key) &&
-        !key.startsWith("$") &&
-        !_.isNull(value) &&
-        !_.isUndefined(value) &&
-        !_.isEmpty(value) &&
-        !_.isObject(value) && // Keeps excluding objects
-        !_.isArray(value) && // Explicitly exclude arrays
-        !(_.isString(value) && isJsonString(value)) && // Exclude JSON strings
-        (_.isString(value) ? value.length < 4096 && value.length > 0 : true) // String length check
-    )
-    .mapValues((value, key) =>
-      _.isString(value) || _.isNumber(value) || _.isBoolean(value)
+  // Convert object to entries and filter
+  const validEntries = Object.entries(toCreateObject).filter(
+    ([key, value]) =>
+      !arrayTypeAttributes.includes(key) &&
+      !key.startsWith("$") &&
+      !isNull(value) &&
+      !isUndefined(value) &&
+      !isNil(value) &&
+      !isPlainObject(value) &&
+      !Array.isArray(value) &&
+      !(isString(value) && isJsonString(value)) &&
+      (isString(value) ? value.length < 4096 && value.length > 0 : true)
+  );
+
+  // Map and filter valid entries
+  const validMappedEntries = validEntries
+    .map(([key, value]) => [
+      key,
+      isString(value) || typeof value === "number" || typeof value === "boolean"
         ? value
-        : null
-    )
-    .omitBy(_.isNull) // Remove any null values that might have been added in mapValues
-    .toPairs()
-    .slice(0, 25) // Limit to 25 to adhere to query limit
-    .map(([key, value]) => Query.equal(key, value as any))
-    .value();
+        : null,
+    ])
+    .filter(([key, value]) => !isNull(value) && isString(key))
+    .slice(0, 25);
+
+  // Convert to Query parameters
+  const validQueryParams = validMappedEntries.map(([key, value]) =>
+    Query.equal(key as string, value as any)
+  );
 
   // Execute the query with the validated and prepared parameters
   const result = await db.listDocuments(