@mimicprotocol/cli 0.0.1-rc.28 → 0.0.1-rc.30

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @mimicprotocol/cli
 
+## 0.0.1-rc.30
+
+### Patch Changes
+
+- 213f37f: Fix class names overlapping
+
+## 0.0.1-rc.29
+
+### Patch Changes
+
+- 72bb607: Fix relevant tokens query price filter
+- 52b567d: Align oracle types naming convention
+- 73a9cde: Fix npx init
+- 0a6602a: Handle oracle query errors
+
 ## 0.0.1-rc.28
 
 ### Patch Changes

package/dist/commands/init.js

@@ -48,12 +48,6 @@ class Init extends core_1.Command {
         const { flags } = await this.parse(Init);
         const { directory, force } = flags;
         const fullDirectory = path.resolve(directory);
-        const originalCwd = process.cwd();
-        const needsCwdChange = originalCwd === fullDirectory || originalCwd.startsWith(fullDirectory + path.sep);
-        if (needsCwdChange) {
-            const parentDir = path.dirname(fullDirectory);
-            process.chdir(parentDir);
-        }
         if (force && fs.existsSync(fullDirectory) && fs.readdirSync(fullDirectory).length > 0) {
             const shouldDelete = process.env.NODE_ENV === 'test'
                 ? true
@@ -67,7 +61,12 @@ class Init extends core_1.Command {
                 this.exit(0);
             }
             log_1.default.startAction(`Deleting contents of ${fullDirectory}`);
-            fs.rmSync(fullDirectory, { recursive: true });
+            // Delete files individually instead of removing the entire directory to preserve
+            // the directory reference. This prevents issues when the directory is the current
+            // working directory, as removing it would cause the reference to be lost.
+            for (const file of fs.readdirSync(fullDirectory)) {
+                fs.rmSync(path.join(fullDirectory, file), { recursive: true, force: true });
+            }
         }
         log_1.default.startAction('Creating files');
         if (fs.existsSync(fullDirectory) && fs.readdirSync(fullDirectory).length > 0) {
@@ -79,22 +78,18 @@ class Init extends core_1.Command {
                 ],
             });
         }
-        if (fs.existsSync(fullDirectory) && fs.readdirSync(fullDirectory).length === 0) {
-            fs.rmSync(fullDirectory, { recursive: true });
-        }
         if (!fs.existsSync(fullDirectory)) {
             fs.mkdirSync(fullDirectory, { recursive: true });
         }
         try {
             await (0, simple_git_1.default)().clone('https://github.com/mimic-protocol/init-template.git', fullDirectory);
+            const gitDir = path.join(fullDirectory, '.git');
+            if (fs.existsSync(gitDir))
+                fs.rmSync(gitDir, { recursive: true, force: true });
         }
         catch (error) {
             this.error(`Failed to clone template repository. Details: ${error}`);
         }
-        // Remove .git to make it a fresh project repo
-        const gitDir = path.join(fullDirectory, '.git');
-        if (fs.existsSync(gitDir))
-            fs.rmSync(gitDir, { recursive: true, force: true });
         this.installDependencies(fullDirectory);
         this.runCodegen(fullDirectory);
         log_1.default.stopAction();

package/dist/lib/AbisInterfaceGenerator/FunctionHandler.js

@@ -92,14 +92,14 @@ class FunctionHandler {
         const capitalizedName = this.getCapitalizedName(fn);
         const isPayable = fn.stateMutability === 'payable';
         const fullMethodParams = methodParams.concat(isPayable ? `${methodParams.length > 0 ? ', ' : ''}value: ${types_1.LibTypes.BigInt}` : '');
-        lines.push(`  ${methodName}(${fullMethodParams}): ${returnType} {`);
-        lines.push(`    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
+        lines.push(`${methodName}(${fullMethodParams}): ${returnType} {`);
+        lines.push(`const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
         importManager.addType(types_1.LibTypes.Bytes);
         importManager.addType('EvmCallBuilder');
         if (isPayable)
             importManager.addType(types_1.LibTypes.BigInt);
-        lines.push(`    return EvmCallBuilder.forChain(this._chainId).addCall(this._address, encodedData${isPayable ? ', value' : ''})`);
-        lines.push(`  }`);
+        lines.push(`return EvmCallBuilder.forChain(this._chainId).addCall(this._address, encodedData${isPayable ? ', value' : ''})`);
+        lines.push(`}`);
         lines.push('');
     }
     static appendReadMethod(lines, fn, importManager, tupleDefinitions, abiTypeConverter, contractName) {
@@ -108,18 +108,25 @@ class FunctionHandler {
         const returnType = this.getReturnType(fn, tupleDefinitions, abiTypeConverter);
         const methodName = fn.escapedName || fn.name;
         const capitalizedName = this.getCapitalizedName(fn);
-        lines.push(`  ${methodName}(${methodParams}): ${returnType} {`);
-        lines.push(`    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
         importManager.addType('environment');
-        const contractCallLine = `environment.contractCall(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`;
-        if (returnType === 'void') {
-            lines.push(`    ${contractCallLine}`);
+        importManager.addType('Result');
+        const isVoid = returnType === 'void';
+        if (isVoid)
+            importManager.addType(types_1.LibTypes.Void);
+        const resultReturnType = isVoid ? `Result<${types_1.LibTypes.Void}, string>` : `Result<${returnType}, string>`;
+        lines.push(`${methodName}(${methodParams}): ${resultReturnType} {`);
+        lines.push(`const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
+        const contractCallLine = `environment.evmCallQuery(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`;
+        lines.push(`const response = ${contractCallLine}`);
+        lines.push(`if (response.isError) return Result.err<${isVoid ? types_1.LibTypes.Void : returnType}, string>(response.error)`);
+        if (isVoid) {
+            lines.push(`return Result.ok<${types_1.LibTypes.Void}, string>(new ${types_1.LibTypes.Void}())`);
         }
         else {
-            lines.push(`    const response = ${contractCallLine}`);
-            lines.push(`    return ${contractName}Utils.decode${capitalizedName}(response)`);
+            lines.push(`const decoded = ${contractName}Utils.decode${capitalizedName}(response.value)`);
+            lines.push(`return Result.ok<${returnType}, string>(decoded)`);
         }
-        lines.push(`  }`);
+        lines.push(`}`);
         lines.push('');
     }
 }

package/dist/lib/AbisInterfaceGenerator/NameManager.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NameContext = void 0;
+const types_1 = require("../../types");
 var NameContext;
 (function (NameContext) {
     NameContext["FUNCTION_PARAMETER"] = "function_parameter";
     NameContext["LOCAL_VARIABLE"] = "local_variable";
     NameContext["CLASS_PROPERTY"] = "class_property";
     NameContext["METHOD_NAME"] = "method_name";
+    NameContext["TUPLE_CLASS_NAME"] = "tuple_class_name";
 })(NameContext || (exports.NameContext = NameContext = {}));
 class NameManager {
     static resolveNameConflicts(names, context) {
@@ -66,6 +68,8 @@ class NameManager {
                 return '_prop';
             case NameContext.METHOD_NAME:
                 return '_';
+            case NameContext.TUPLE_CLASS_NAME:
+                return '_class';
             default:
                 return '_safe';
         }
@@ -93,6 +97,7 @@ NameManager.RESERVED_BY_CONTEXT = {
         'timestamp',
     ]),
     [NameContext.METHOD_NAME]: new Set(['constructor']),
+    [NameContext.TUPLE_CLASS_NAME]: new Set([...Object.values(types_1.LibTypes), 'JSON']),
 };
 NameManager.INTERNAL_NAME_PATTERNS = [/^item\d+$/, /^s\d+$/];
 exports.default = NameManager;

package/dist/lib/AbisInterfaceGenerator/TupleHandler.js

@@ -103,6 +103,7 @@ class TupleHandler {
                 if (structMatch && structMatch[1])
                     className = structMatch[1];
             }
+            className = NameManager_1.default.escapeName(className, NameManager_1.NameContext.TUPLE_CLASS_NAME);
             const key = baseInternalType || className;
             const components = this.resolveComponentNames(tupleToDefine.components, NameManager_1.NameContext.CLASS_PROPERTY);
             tupleDefinitions.set(key, {

package/dist/types.js

@@ -8,6 +8,8 @@ var LibTypes;
     LibTypes["Bytes"] = "Bytes";
     LibTypes["ChainId"] = "ChainId";
     LibTypes["TokenAmount"] = "TokenAmount";
+    LibTypes["Void"] = "Void";
+    LibTypes["Result"] = "Result";
 })(LibTypes || (exports.LibTypes = LibTypes = {}));
 var AssemblyPrimitiveTypes;
 (function (AssemblyPrimitiveTypes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimicprotocol/cli",
-  "version": "0.0.1-rc.28",
+  "version": "0.0.1-rc.30",
   "license": "GPL-3.0",
   "private": false,
   "type": "commonjs",