fix: repaired parse-server-migration. (#1138)

.changeset/few-humans-breathe.md

@@ -0,0 +1,6 @@
+---
+'@moralisweb3/common-evm-utils': patch
+'@moralisweb3/common-sol-utils': patch
+---
+
+The package includes now the `operationsV2All` collection for the backward compatibility. This collection will be deleted in the future.

demos/express-proxy/src/api/proxyGenerator.ts

@@ -1,6 +1,6 @@
 import Moralis from 'moralis';
-import { operationsV2 as solOperations } from 'moralis/common-sol-utils';
-import { operationsV2 as evmOperations } from 'moralis/common-evm-utils';
+import { operationsV2All as solOperations } from 'moralis/common-sol-utils';
+import { operationsV2All as evmOperations } from 'moralis/common-evm-utils';
 import express from 'express';
 import axios from 'axios';
 import { errorHandler } from '../middlewares/errorHandler';

demos/parse-server-migration/scripts/utils/generateApiCloudCode.ts

@@ -1,3 +1,4 @@
+import { toCamel } from '@moralisweb3/common-core';
 import { Endpoint } from '../types/Endpoint';
 import fs from 'fs';
 
@@ -28,16 +29,15 @@ const getModulePackageName = (module: Module) => {
 const generateCloudCode = (module: Module, endpoint: Endpoint) => {
   let code = '';
   const name = `${getModulePrefix(module)}${endpoint.name}`;
+  const groupName = toCamel(endpoint.group.replace(/\s+/, '_'));
   const varName = `${endpoint.name}Operation`;
   code += `
 const ${varName} = getOperation('${endpoint.methodName}');
 Parse.Cloud.define("${name}", async ({params, user, ip}: any) => {
   try {
     await beforeApiRequest(user, ip, '${endpoint.name}');
     const request = upgradeRequest(params, ${varName});
-    const result = await Moralis.${module}.${endpoint.group}.${endpoint.methodName}(${
-    endpoint.noArgs ? '' : 'request'
-  });
+    const result = await Moralis.${module}.${groupName}.${endpoint.methodName}(${endpoint.noArgs ? '' : 'request'});
     return result?.raw;
   } catch (error) {
     throw new Error(getErrorMessage(error, '${name}'));
@@ -57,7 +57,7 @@ import { MoralisError, Operation } from '@moralisweb3/common-core';
 import { handleRateLimit } from '../../rateLimit';
 import { upgradeRequest } from '../upgradeRequest'
 import { AxiosError } from 'axios';
-import { operations } from '${packageName}';
+import { operationsV2All as operations } from '${packageName}';
 declare const Parse: any;
 
 function getErrorMessage(error: Error, name: string) {

demos/parse-server-migration/src/cloud/generated/evmApi.ts

@@ -6,7 +6,7 @@ import { MoralisError, Operation } from '@moralisweb3/common-core';
 import { handleRateLimit } from '../../rateLimit';
 import { upgradeRequest } from '../upgradeRequest'
 import { AxiosError } from 'axios';
-import { operationsV2 as operations } from '@moralisweb3/common-evm-utils';
+import { operationsV2All as operations } from '@moralisweb3/common-evm-utils';
 declare const Parse: any;
 
 function getErrorMessage(error: Error, name: string) {

demos/parse-server-migration/src/cloud/generated/solApi.ts

@@ -6,7 +6,7 @@ import { MoralisError, Operation } from '@moralisweb3/common-core';
 import { handleRateLimit } from '../../rateLimit';
 import { upgradeRequest } from '../upgradeRequest'
 import { AxiosError } from 'axios';
-import { operationsV2 as operations } from '@moralisweb3/common-sol-utils';
+import { operationsV2All as operations } from '@moralisweb3/common-sol-utils';
 declare const Parse: any;
 
 function getErrorMessage(error: Error, name: string) {

demos/parse-server/src/api/proxyGenerator.ts

@@ -2,8 +2,8 @@ import Moralis from 'moralis';
 import express from 'express';
 import axios from 'axios';
 import { errorHandler } from '../middlewares/errorHandler';
-import { operationsV2 as solOperations } from 'moralis/common-sol-utils';
-import { operationsV2 as evmOperations } from 'moralis/common-evm-utils';
+import { operationsV2All as solOperations } from 'moralis/common-sol-utils';
+import { operationsV2All as evmOperations } from 'moralis/common-evm-utils';
 import { convertOperationToDescriptor } from '@moralisweb3/api-utils';
 
 const proxyRouter = express.Router();

packages/common/evmUtils/src/operations/operations.ts

@@ -12,6 +12,7 @@ import {
   getNFTMetadataOperation,
   getNFTOwnersOperation,
   getNFTTokenIdOwnersOperation,
+  getNFTTradesOperation,
   getNFTTransfersByBlockOperation,
   getNFTTransfersFromToBlockOperation,
   getNFTTransfersOperation,
@@ -34,6 +35,7 @@ import {
   getWalletTokenTransfersOperation,
   getErc20ApprovalsOperation,
   getErc20BurnsOperation,
+  getErc20TransfersOperation,
 } from './token';
 import {
   getTransactionOperation,
@@ -42,7 +44,7 @@ import {
   getWalletTransactionsVerboseOperation,
   getInternalTransactionsOperation,
 } from './transaction';
-import { runContractFunctionOperation } from './utils';
+import { endpointWeightsOperation, runContractFunctionOperation, web3ApiVersionOperation } from './utils';
 
 export const operationsV2 = [
   getBlockOperation,
@@ -91,3 +93,14 @@ export const operationsV2 = [
   syncNFTContractOperation,
   uploadFolderOperation,
 ];
+
+/**
+ * @deprecated This list includes upgraded operations to the hybrid approach in the old format.
+ */
+export const operationsV2All = [
+  ...operationsV2,
+  endpointWeightsOperation,
+  web3ApiVersionOperation,
+  getNFTTradesOperation,
+  getErc20TransfersOperation,
+];

packages/common/solUtils/src/operations/operations.ts

@@ -3,6 +3,7 @@ import { getNFTsOperation } from './account/getNFTsOperation';
 import { getPortfolioOperation } from './account/getPortfolioOperation';
 import { getSPLOperation } from './account/getSPLOperation';
 import { getNFTMetadataOperation } from './nft/getNFTMetadataOperation';
+import { getTokenPriceOperation } from './token/getTokenPriceOperation';
 
 export const operationsV2 = [
   getBalanceOperation,
@@ -11,3 +12,8 @@ export const operationsV2 = [
   getSPLOperation,
   getNFTMetadataOperation,
 ];
+
+/**
+ * @deprecated This list includes upgraded operations to the hybrid approach in the old format.
+ */
+export const operationsV2All = [...operationsV2, getTokenPriceOperation];

packages/next/src/MoralisNextApi/Modules.ts

@@ -1,12 +1,7 @@
 import { EvmApi } from '@moralisweb3/evm-api';
 import { Core, UnknownOperation } from '@moralisweb3/common-core';
-import {
-  endpointWeightsOperation,
-  operationsV2 as evmOperationsV2,
-  getNFTTradesOperation,
-  web3ApiVersionOperation,
-} from 'moralis/common-evm-utils';
-import { getTokenPriceOperation, operationsV2 as solOperations } from 'moralis/common-sol-utils';
+import { operationsV2All as evmOperationsV2 } from 'moralis/common-evm-utils';
+import { operationsV2All as solOperationsV2 } from 'moralis/common-sol-utils';
 import { operations as authOperations } from '@moralisweb3/common-auth-utils';
 import { Auth } from '@moralisweb3/auth';
 import { SolApi } from '@moralisweb3/sol-api';
@@ -47,19 +42,9 @@ export class Module {
   }
 }
 
-const allEvmOperations = [
-  ...evmOperationsV2,
-  // TODO: I've added these 3 operations manually here but this file should use a converter V2 -> V3.
-  endpointWeightsOperation,
-  web3ApiVersionOperation,
-  getNFTTradesOperation,
-];
-
-const allSolOperations = [...solOperations, getTokenPriceOperation];
-
 const modules: Module[] = [
-  new Module(EvmApi.moduleName, allEvmOperations as UnknownOperation[]),
-  new Module(SolApi.moduleName, allSolOperations as UnknownOperation[]),
+  new Module(EvmApi.moduleName, evmOperationsV2 as UnknownOperation[]),
+  new Module(SolApi.moduleName, solOperationsV2 as UnknownOperation[]),
   new Module(Auth.moduleName, authOperations as UnknownOperation[]),
 ];