appwrite-utils-cli 0.10.81 → 0.10.83

package/dist/migrations/validationRules.js

@@ -1,11 +1,11 @@
-import _ from "lodash";
+import { isNumber, isString, isBoolean, isArray, isPlainObject, isNull, isUndefined, isDate, isEmpty, isInteger, isArrayLike, isArrayLikeObject, isFunction, isLength, isMap, isSet, isRegExp, isSymbol, isObjectLike, isSafeInteger, isTypedArray, isEqual, isMatch, has, get, } from "es-toolkit/compat";
 export const validationRules = {
-    isNumber: (value) => _.isNumber(value),
-    isString: (value) => _.isString(value),
-    isBoolean: (value) => _.isBoolean(value),
-    isArray: (value) => _.isArray(value),
-    isObject: (value) => _.isObject(value) && !_.isArray(value) && !_.isFunction(value),
-    isNull: (value) => _.isNull(value),
+    isNumber: (value) => isNumber(value),
+    isString: (value) => isString(value),
+    isBoolean: (value) => isBoolean(value),
+    isArray: (value) => isArray(value),
+    isObject: (value) => isPlainObject(value) && !isArray(value) && !isFunction(value),
+    isNull: (value) => isNull(value),
     isValidEmail: (value) => value.match(/^[\w\-\.]+@([\w-]+\.)+[\w-]{2,}$/) !== null,
     isValidPhone: (value) => value.match(/^[+]?[(]?[0-9]{3}[)]?[-\s.]?[0-9]{3}[-\s.]?[0-9]{4,6}$/im) !==
         null,
@@ -16,27 +16,27 @@ export const validationRules = {
     isValidHexAlpha: (value) => value.match(/^#([a-f0-9]{8}|[a-f0-9]{4})$/i) !== null,
     isValidDate: (value) => value.match(/^\d{4}-\d{2}-\d{2}$/) !== null,
     isValidTime: (value) => value.match(/^\d{2}:\d{2}(:\d{2})?$/) !== null,
-    isNullish: (value) => _.isNull(value) || _.isUndefined(value),
-    isUndefined: (value) => _.isUndefined(value),
-    isDefined: (value) => !_.isUndefined(value) && !_.isNull(value) && !_.isEmpty(value),
-    isDate: (value) => _.isDate(value),
-    isEmpty: (value) => _.isEmpty(value),
-    isInteger: (value) => _.isInteger(value),
-    isFloat: (value) => _.isNumber(value) && !_.isInteger(value),
-    isArrayLike: (value) => _.isArrayLike(value),
-    isArrayLikeObject: (value) => _.isArrayLikeObject(value),
-    isFunction: (value) => _.isFunction(value),
-    isLength: (value) => _.isLength(value),
-    isMap: (value) => _.isMap(value),
-    isSet: (value) => _.isSet(value),
-    isRegExp: (value) => _.isRegExp(value),
-    isSymbol: (value) => _.isSymbol(value),
-    isObjectLike: (value) => _.isObjectLike(value),
-    isPlainObject: (value) => _.isPlainObject(value),
-    isSafeInteger: (value) => _.isSafeInteger(value),
-    isTypedArray: (value) => _.isTypedArray(value),
-    isEqual: (value, other) => _.isEqual(value, other),
-    isMatch: (object, source) => _.isMatch(object, source),
-    has: (object, path) => _.has(object, path),
-    get: (object, path, defaultValue) => _.get(object, path, defaultValue),
+    isNullish: (value) => isNull(value) || isUndefined(value),
+    isUndefined: (value) => isUndefined(value),
+    isDefined: (value) => !isUndefined(value) && !isNull(value) && !isEmpty(value),
+    isDate: (value) => isDate(value),
+    isEmpty: (value) => isEmpty(value),
+    isInteger: (value) => isInteger(value),
+    isFloat: (value) => isNumber(value) && !isInteger(value),
+    isArrayLike: (value) => isArrayLike(value),
+    isArrayLikeObject: (value) => isArrayLikeObject(value),
+    isFunction: (value) => isFunction(value),
+    isLength: (value) => isLength(value),
+    isMap: (value) => isMap(value),
+    isSet: (value) => isSet(value),
+    isRegExp: (value) => isRegExp(value),
+    isSymbol: (value) => isSymbol(value),
+    isObjectLike: (value) => isObjectLike(value),
+    isPlainObject: (value) => isPlainObject(value),
+    isSafeInteger: (value) => isSafeInteger(value),
+    isTypedArray: (value) => isTypedArray(value),
+    isEqual: (value, other) => isEqual(value, other),
+    isMatch: (object, source) => isMatch(object, source),
+    has: (object, path) => has(object, path),
+    get: (object, path, defaultValue) => get(object, path, defaultValue),
 };

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.83",
   "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/attributes.ts

@@ -5,7 +5,6 @@ import {
   type Attribute,
 } from "appwrite-utils";
 import { nameToIdMapping, enqueueOperation } from "../migrations/queue.js";
-import _ from "lodash";
 import { delay, tryAwaitWithRetry } from "../utils/helperFunctions.js";
 import chalk from "chalk";
 
@@ -14,24 +13,24 @@ const attributesSame = (
   configAttribute: Attribute
 ): boolean => {
   const attributesToCheck = [
-    'key',
-    'type',
-    'array',
-    'encrypted',
-    'required',
-    'size',
-    'min',
-    'max',
-    'xdefault',
-    'elements',
-    'relationType',
-    'twoWay',
-    'twoWayKey',
-    'onDelete',
-    'relatedCollection'
+    "key",
+    "type",
+    "array",
+    "encrypted",
+    "required",
+    "size",
+    "min",
+    "max",
+    "xdefault",
+    "elements",
+    "relationType",
+    "twoWay",
+    "twoWayKey",
+    "onDelete",
+    "relatedCollection",
   ];
 
-  return attributesToCheck.every(attr => {
+  return attributesToCheck.every((attr) => {
     // Check if both objects have the attribute
     const dbHasAttr = attr in databaseAttribute;
     const configHasAttr = attr in configAttribute;
@@ -42,7 +41,10 @@ const attributesSame = (
       const configValue = configAttribute[attr as keyof typeof configAttribute];
 
       // Consider undefined and null as equivalent
-      if ((dbValue === undefined || dbValue === null) && (configValue === undefined || configValue === null)) {
+      if (
+        (dbValue === undefined || dbValue === null) &&
+        (configValue === undefined || configValue === null)
+      ) {
         return true;
       }
 
@@ -91,10 +93,18 @@ export const createOrUpdateAttribute = async (
     foundAttribute = undefined;
   }
 
-  if (foundAttribute && attributesSame(foundAttribute, attribute) && updateEnabled) {
+  if (
+    foundAttribute &&
+    attributesSame(foundAttribute, attribute) &&
+    updateEnabled
+  ) {
     // No need to do anything, they are the same
     return;
-  } else if (foundAttribute && !attributesSame(foundAttribute, attribute) && updateEnabled) {
+  } else if (
+    foundAttribute &&
+    !attributesSame(foundAttribute, attribute) &&
+    updateEnabled
+  ) {
     // console.log(
     //   `Updating attribute with same key ${attribute.key} but different values`
     // );
@@ -103,9 +113,15 @@ export const createOrUpdateAttribute = async (
       ...attribute,
     };
     action = "update";
-  } else if (!updateEnabled && foundAttribute && !attributesSame(foundAttribute, attribute)) {
+  } else if (
+    !updateEnabled &&
+    foundAttribute &&
+    !attributesSame(foundAttribute, attribute)
+  ) {
     await db.deleteAttribute(dbId, collection.$id, attribute.key);
-    console.log(`Deleted attribute: ${attribute.key} to recreate it because they diff (update disabled temporarily)`);
+    console.log(
+      `Deleted attribute: ${attribute.key} to recreate it because they diff (update disabled temporarily)`
+    );
     return;
   }
 
@@ -168,7 +184,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.key,
               finalAttribute.size,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false,
               finalAttribute.encrypted
             )
@@ -181,7 +199,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -209,7 +229,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.required || false,
               finalAttribute.min || -2147483647,
               finalAttribute.max || 2147483647,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -235,7 +257,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.required || false,
               finalAttribute.min || -2147483647,
               finalAttribute.max || 2147483647,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -251,7 +275,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.required || false,
               finalAttribute.min || -2147483647,
               finalAttribute.max || 2147483647,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -265,7 +291,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.required || false,
               finalAttribute.min || -2147483647,
               finalAttribute.max || 2147483647,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -279,7 +307,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -291,7 +321,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -305,7 +337,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -317,7 +351,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -331,7 +367,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -343,7 +381,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -357,7 +397,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -369,7 +411,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -383,7 +427,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -395,7 +441,9 @@ export const createOrUpdateAttribute = async (
               collection.$id,
               finalAttribute.key,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -410,7 +458,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.key,
               finalAttribute.elements,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null,
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null,
               finalAttribute.array || false
             )
         );
@@ -423,7 +473,9 @@ export const createOrUpdateAttribute = async (
               finalAttribute.key,
               finalAttribute.elements,
               finalAttribute.required || false,
-              finalAttribute.xdefault !== undefined && !finalAttribute.required ? finalAttribute.xdefault : null
+              finalAttribute.xdefault !== undefined && !finalAttribute.required
+                ? finalAttribute.xdefault
+                : null
             )
         );
       }
@@ -468,26 +520,47 @@ export const createUpdateCollectionAttributes = async (
   attributes: Attribute[]
 ): Promise<void> => {
   console.log(
-    chalk.green(`Creating/Updating attributes for collection: ${collection.name}`)
+    chalk.green(
+      `Creating/Updating attributes for collection: ${collection.name}`
+    )
   );
 
-  // @ts-expect-error
-  const existingAttributes: Attribute[] = collection.attributes.map((attr) => parseAttribute(attr)) || [];
+  const existingAttributes: Attribute[] =
+    // @ts-expect-error
+    collection.attributes.map((attr) => parseAttribute(attr)) || [];
 
-  const attributesToRemove = existingAttributes.filter((attr) => !attributes.some((a) => a.key === attr.key));
-  const indexesToRemove = collection.indexes.filter((index) => attributesToRemove.some((attr) => index.attributes.includes(attr.key)));
+  const attributesToRemove = existingAttributes.filter(
+    (attr) => !attributes.some((a) => a.key === attr.key)
+  );
+  const indexesToRemove = collection.indexes.filter((index) =>
+    attributesToRemove.some((attr) => index.attributes.includes(attr.key))
+  );
 
   if (attributesToRemove.length > 0) {
     if (indexesToRemove.length > 0) {
-      console.log(chalk.red(`Removing indexes as they rely on an attribute that is being removed: ${indexesToRemove.map((index) => index.key).join(", ")}`));
+      console.log(
+        chalk.red(
+          `Removing indexes as they rely on an attribute that is being removed: ${indexesToRemove
+            .map((index) => index.key)
+            .join(", ")}`
+        )
+      );
       for (const index of indexesToRemove) {
-        await tryAwaitWithRetry(async () => await db.deleteIndex(dbId, collection.$id, index.key));
+        await tryAwaitWithRetry(
+          async () => await db.deleteIndex(dbId, collection.$id, index.key)
+        );
         await delay(100);
       }
     }
     for (const attr of attributesToRemove) {
-      console.log(chalk.red(`Removing attribute: ${attr.key} as it is no longer in the collection`));
-      await tryAwaitWithRetry(async () => await db.deleteAttribute(dbId, collection.$id, attr.key));
+      console.log(
+        chalk.red(
+          `Removing attribute: ${attr.key} as it is no longer in the collection`
+        )
+      );
+      await tryAwaitWithRetry(
+        async () => await db.deleteAttribute(dbId, collection.$id, attr.key)
+      );
       await delay(50);
     }
   }
@@ -496,7 +569,10 @@ export const createUpdateCollectionAttributes = async (
   for (let i = 0; i < attributes.length; i += batchSize) {
     const batch = attributes.slice(i, i + batchSize);
     const attributePromises = batch.map((attribute) =>
-      tryAwaitWithRetry(async () => await createOrUpdateAttribute(db, dbId, collection, attribute))
+      tryAwaitWithRetry(
+        async () =>
+          await createOrUpdateAttribute(db, dbId, collection, attribute)
+      )
     );
 
     const results = await Promise.allSettled(attributePromises);