appwrite-utils-cli 0.10.82 → 0.10.83

package/src/migrations/dataLoader.ts

@@ -16,14 +16,14 @@ import path from "path";
 import fs from "fs";
 import { convertObjectByAttributeMappings } from "./converters.js";
 import { z } from "zod";
-import { checkForCollection } from "./collections.js";
+import { checkForCollection } from "../collections/methods.js";
 import { ID, Users, type Databases } from "node-appwrite";
 import { logger } from "./logging.js";
 import { findOrCreateOperation, updateOperation } from "./migrationHelper.js";
 import { AuthUserCreateSchema } from "../schemas/authUser.js";
-import _ from "lodash";
 import { UsersController } from "./users.js";
 import { finalizeByAttributeMap } from "../utils/helperFunctions.js";
+import { isEmpty } from "es-toolkit/compat";
 
 // Define a schema for the structure of collection import data using Zod for validation
 export const CollectionImportDataSchema = z.object({
@@ -315,7 +315,7 @@ export class DataLoader {
         // Find or create an import operation for the collection
         const collectionImportOperation = await findOrCreateOperation(
           this.database,
-          collection.$id,
+          collection.$id!,
           "importData"
         );
         // Store the operation ID in the map
@@ -556,7 +556,7 @@ export class DataLoader {
                 // Skip if value to match is missing or empty
                 if (
                   !sourceValue ||
-                  _.isEmpty(sourceValue) ||
+                  isEmpty(sourceValue) ||
                   sourceValue === null
                 )
                   continue;

package/src/migrations/importController.ts

@@ -13,7 +13,6 @@ import type {
   AttributeMappings,
 } from "appwrite-utils";
 import type { ImportDataActions } from "./importDataActions.js";
-import _ from "lodash";
 import { areCollectionNamesSame, tryAwaitWithRetry } from "../utils/index.js";
 import type { SetupOptions } from "../utilsController.js";
 import { resolveAndUpdateRelationships } from "./relationships.js";

package/src/migrations/queue.ts

@@ -1,8 +1,7 @@
 import { Query, type Databases, type Models } from "node-appwrite";
 import type { Attribute } from "appwrite-utils";
 import { createOrUpdateAttribute } from "./attributes.js";
-import _ from "lodash";
-import { fetchAndCacheCollectionByName } from "./collections.js";
+import { fetchAndCacheCollectionByName } from "../collections/methods.js";
 import { tryAwaitWithRetry } from "../utils/helperFunctions.js";
 
 export interface QueuedOperation {

package/src/migrations/relationships.ts

@@ -1,5 +1,5 @@
 import { Databases, Query, type Models } from "node-appwrite";
-import { fetchAllCollections } from "./collections.js";
+import { fetchAllCollections } from "../collections/methods.js";
 import type {
   AppwriteConfig,
   Attribute,

package/src/migrations/users.ts

@@ -12,13 +12,14 @@ import {
   type AuthUser,
   type AuthUserCreate,
 } from "../schemas/authUser.js";
-import _ from "lodash";
 import { logger } from "./logging.js";
 import { splitIntoBatches } from "./migrationHelper.js";
 import {
   getAppwriteClient,
   tryAwaitWithRetry,
 } from "../utils/helperFunctions.js";
+import { isUndefined } from "es-toolkit/compat";
+import { isEmpty } from "es-toolkit/compat";
 
 export class UsersController {
   private config: AppwriteConfig;
@@ -123,17 +124,17 @@ export class UsersController {
           `changeMe${item.email?.toLowerCase()}` || `changeMePlease`,
           item.name || undefined
         );
-  
+
         if (item.labels) {
           await this.users.updateLabels(createdUser.$id, item.labels);
         }
         if (item.prefs) {
           await this.users.updatePrefs(createdUser.$id, item.prefs);
         }
-        
+
         return createdUser;
       }); // Set throwError to true since we want to handle errors
-  
+
       return user;
     } catch (e) {
       if (e instanceof Error) {
@@ -181,8 +182,8 @@ export class UsersController {
         if (
           item.email &&
           item.email !== userToReturn.email &&
-          !_.isEmpty(item.email) &&
-          !_.isUndefined(item.email)
+          !isEmpty(item.email) &&
+          !isUndefined(item.email)
         ) {
           const emailExists = await this.users.list([
             Query.equal("email", item.email),
@@ -213,7 +214,7 @@ export class UsersController {
           item.phone !== userToReturn.phone &&
           item.phone.length < 15 &&
           item.phone.startsWith("+") &&
-          (_.isUndefined(userToReturn.phone) || _.isEmpty(userToReturn.phone))
+          (isUndefined(userToReturn.phone) || isEmpty(userToReturn.phone))
         ) {
           const userFoundWithPhone = await this.users.list([
             Query.equal("phone", item.phone),

package/src/migrations/validationRules.ts

@@ -1,17 +1,42 @@
-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 interface ValidationRules {
   [key: string]: (value: any, ...args: any[]) => boolean;
 }
 
 export const validationRules = {
-  isNumber: (value: any): boolean => _.isNumber(value),
-  isString: (value: any): boolean => _.isString(value),
-  isBoolean: (value: any): boolean => _.isBoolean(value),
-  isArray: (value: any): boolean => _.isArray(value),
+  isNumber: (value: any): boolean => isNumber(value),
+  isString: (value: any): boolean => isString(value),
+  isBoolean: (value: any): boolean => isBoolean(value),
+  isArray: (value: any): boolean => isArray(value),
   isObject: (value: any): boolean =>
-    _.isObject(value) && !_.isArray(value) && !_.isFunction(value),
-  isNull: (value: any): boolean => _.isNull(value),
+    isPlainObject(value) && !isArray(value) && !isFunction(value),
+  isNull: (value: any): boolean => isNull(value),
   isValidEmail: (value: string): boolean =>
     value.match(/^[\w\-\.]+@([\w-]+\.)+[\w-]{2,}$/) !== null,
   isValidPhone: (value: string): boolean =>
@@ -35,29 +60,29 @@ export const validationRules = {
     value.match(/^\d{4}-\d{2}-\d{2}$/) !== null,
   isValidTime: (value: string): boolean =>
     value.match(/^\d{2}:\d{2}(:\d{2})?$/) !== null,
-  isNullish: (value: any): boolean => _.isNull(value) || _.isUndefined(value),
-  isUndefined: (value: any): boolean => _.isUndefined(value),
+  isNullish: (value: any): boolean => isNull(value) || isUndefined(value),
+  isUndefined: (value: any): boolean => isUndefined(value),
   isDefined: (value: any): boolean =>
-    !_.isUndefined(value) && !_.isNull(value) && !_.isEmpty(value),
-  isDate: (value: any): boolean => _.isDate(value),
-  isEmpty: (value: any): boolean => _.isEmpty(value),
-  isInteger: (value: any): boolean => _.isInteger(value),
-  isFloat: (value: any): boolean => _.isNumber(value) && !_.isInteger(value),
-  isArrayLike: (value: any): boolean => _.isArrayLike(value),
-  isArrayLikeObject: (value: any): boolean => _.isArrayLikeObject(value),
-  isFunction: (value: any): boolean => _.isFunction(value),
-  isLength: (value: any): boolean => _.isLength(value),
-  isMap: (value: any): boolean => _.isMap(value),
-  isSet: (value: any): boolean => _.isSet(value),
-  isRegExp: (value: any): boolean => _.isRegExp(value),
-  isSymbol: (value: any): boolean => _.isSymbol(value),
-  isObjectLike: (value: any): boolean => _.isObjectLike(value),
-  isPlainObject: (value: any): boolean => _.isPlainObject(value),
-  isSafeInteger: (value: any): boolean => _.isSafeInteger(value),
-  isTypedArray: (value: any): boolean => _.isTypedArray(value),
-  isEqual: (value: any, other: any): boolean => _.isEqual(value, other),
-  isMatch: (object: any, source: any): boolean => _.isMatch(object, source),
-  has: (object: any, path: string): boolean => _.has(object, path),
+    !isUndefined(value) && !isNull(value) && !isEmpty(value),
+  isDate: (value: any): boolean => isDate(value),
+  isEmpty: (value: any): boolean => isEmpty(value),
+  isInteger: (value: any): boolean => isInteger(value),
+  isFloat: (value: any): boolean => isNumber(value) && !isInteger(value),
+  isArrayLike: (value: any): boolean => isArrayLike(value),
+  isArrayLikeObject: (value: any): boolean => isArrayLikeObject(value),
+  isFunction: (value: any): boolean => isFunction(value),
+  isLength: (value: any): boolean => isLength(value),
+  isMap: (value: any): boolean => isMap(value),
+  isSet: (value: any): boolean => isSet(value),
+  isRegExp: (value: any): boolean => isRegExp(value),
+  isSymbol: (value: any): boolean => isSymbol(value),
+  isObjectLike: (value: any): boolean => isObjectLike(value),
+  isPlainObject: (value: any): boolean => isPlainObject(value),
+  isSafeInteger: (value: any): boolean => isSafeInteger(value),
+  isTypedArray: (value: any): boolean => isTypedArray(value),
+  isEqual: (value: any, other: any): boolean => isEqual(value, other),
+  isMatch: (object: any, source: any): boolean => isMatch(object, source),
+  has: (object: any, path: string): boolean => has(object, path),
   get: (object: any, path: string, defaultValue: any): any =>
-    _.get(object, path, defaultValue),
+    get(object, path, defaultValue),
 };