chore: prevent naming collisions on typegen (#3620)

Author: Torres-ssf

.changeset/six-moles-wonder.md

@@ -0,0 +1,6 @@
+---
+"@fuel-ts/abi-typegen": patch
+"@fuel-ts/recipes": patch
+---
+
+chore: prevent naming collisions on typegen

packages/abi-typegen/src/templates/contract/factory.hbs

@@ -1,13 +1,13 @@
 {{header}}
 
-import { ContractFactory, decompressBytecode } from "fuels";
+import { ContractFactory as __ContractFactory, decompressBytecode } from "fuels";
 import type { Provider, Account, DeployContractOptions } from "fuels";
 
 import { {{capitalizedName}} } from "./{{capitalizedName}}";
 
 const bytecode = decompressBytecode("{{compressedBytecode}}");
 
-export class {{capitalizedName}}Factory extends ContractFactory<{{capitalizedName}}> {
+export class {{capitalizedName}}Factory extends __ContractFactory<{{capitalizedName}}> {
 
   static readonly bytecode = bytecode;
 

packages/abi-typegen/src/templates/contract/main.hbs

@@ -1,6 +1,6 @@
 {{header}}
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 {{#if imports}}
 import type {
   Provider,
@@ -69,7 +69,7 @@ export class {{capitalizedName}}Interface extends Interface {
   };
 }
 
-export class {{capitalizedName}} extends Contract {
+export class {{capitalizedName}} extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

packages/abi-typegen/src/templates/predicate/main.hbs

@@ -61,7 +61,7 @@ const abi = {{abiJsonString}};
 
 const bytecode = decompressBytecode('{{compressedBytecode}}');
 
-export class {{capitalizedName}} extends Predicate<
+export class {{capitalizedName}} extends __Predicate<
   {{capitalizedName}}Inputs,
   {{capitalizedName}}Configurables
 > {

packages/abi-typegen/src/templates/predicate/main.ts

@@ -34,7 +34,13 @@ export function renderMainTemplate(params: { abi: Abi; versions: BinaryVersions
   const { structs } = formatStructs({ types });
   const { imports } = formatImports({
     types,
-    baseMembers: ['Predicate', 'Provider', 'InputValue', 'PredicateParams', 'decompressBytecode'],
+    baseMembers: [
+      'Predicate as __Predicate',
+      'Provider',
+      'InputValue',
+      'PredicateParams',
+      'decompressBytecode',
+    ],
   });
 
   const { prefixedInputs: inputs, output } = func.attributes;

packages/abi-typegen/src/templates/script/main.hbs

@@ -55,7 +55,7 @@ const abi = {{abiJsonString}};
 
 const bytecode = decompressBytecode('{{compressedBytecode}}');
 
-export class {{capitalizedName}} extends Script<{{capitalizedName}}Inputs, {{capitalizedName}}Output> {
+export class {{capitalizedName}} extends __Script<{{capitalizedName}}Inputs, {{capitalizedName}}Output> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

packages/abi-typegen/src/templates/script/main.ts

@@ -34,7 +34,7 @@ export function renderMainTemplate(params: { abi: Abi; versions: BinaryVersions
   const { structs } = formatStructs({ types });
   const { imports } = formatImports({
     types,
-    baseMembers: ['Script', 'Account', 'decompressBytecode'],
+    baseMembers: ['Script as __Script', 'Account', 'decompressBytecode'],
   });
 
   const { prefixedInputs: inputs, output } = func.attributes;

packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs

@@ -10,7 +10,7 @@
   Fuel-Core version: 33.33.33
 */
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 import type {
   Provider,
   Account,
@@ -187,7 +187,7 @@ export class MyContractInterface extends Interface {
   };
 }
 
-export class MyContract extends Contract {
+export class MyContract extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

packages/abi-typegen/test/fixtures/templates/contract/factory.hbs

@@ -10,14 +10,14 @@
   Fuel-Core version: 33.33.33
 */
 
-import { ContractFactory, decompressBytecode } from "fuels";
+import { ContractFactory as __ContractFactory, decompressBytecode } from "fuels";
 import type { Provider, Account, DeployContractOptions } from "fuels";
 
 import { MyContract } from "./MyContract";
 
 const bytecode = decompressBytecode("0x-bytecode-here");
 
-export class MyContractFactory extends ContractFactory<MyContract> {
+export class MyContractFactory extends __ContractFactory<MyContract> {
 
   static readonly bytecode = bytecode;
 

packages/abi-typegen/test/fixtures/templates/contract/main.hbs

@@ -10,7 +10,7 @@
   Fuel-Core version: 33.33.33
 */
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 import type {
   Provider,
   Account,
@@ -1199,7 +1199,7 @@ export class MyContractInterface extends Interface {
   };
 }
 
-export class MyContract extends Contract {
+export class MyContract extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs

@@ -14,7 +14,7 @@ import {
   BigNumberish,
   decompressBytecode,
   InputValue,
-  Predicate,
+  Predicate as __Predicate,
   PredicateParams,
   Provider,
 } from 'fuels';
@@ -85,7 +85,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyPredicate extends Predicate<
+export class MyPredicate extends __Predicate<
   MyPredicateInputs,
   MyPredicateConfigurables
 > {

packages/abi-typegen/test/fixtures/templates/predicate/main.hbs

@@ -15,7 +15,7 @@ import {
   BN,
   decompressBytecode,
   InputValue,
-  Predicate,
+  Predicate as __Predicate,
   PredicateParams,
   Provider,
 } from 'fuels';
@@ -276,7 +276,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyPredicate extends Predicate<
+export class MyPredicate extends __Predicate<
   MyPredicateInputs,
   MyPredicateConfigurables
 > {

packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs

@@ -14,7 +14,7 @@ import {
   Account,
   BigNumberish,
   decompressBytecode,
-  Script,
+  Script as __Script,
 } from 'fuels';
 
 export type ScoreInput = { user: BigNumberish, points: BigNumberish };
@@ -88,7 +88,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyScript extends Script<MyScriptInputs, MyScriptOutput> {
+export class MyScript extends __Script<MyScriptInputs, MyScriptOutput> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

packages/abi-typegen/test/fixtures/templates/script/main.hbs

@@ -15,7 +15,7 @@ import {
   BigNumberish,
   BN,
   decompressBytecode,
-  Script,
+  Script as __Script,
 } from 'fuels';
 
 import type { Option, Enum, Vec, Result } from "./common";
@@ -268,7 +268,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyScript extends Script<MyScriptInputs, MyScriptOutput> {
+export class MyScript extends __Script<MyScriptInputs, MyScriptOutput> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

packages/fuel-gauge/src/auth-testing.test.ts

@@ -1,7 +1,7 @@
 import { getRandomB256 } from 'fuels';
 import { launchTestNode } from 'fuels/test-utils';
 
-import { AuthTestingContractFactory } from '../test/typegen/contracts';
+import { ContractFactory } from '../test/typegen/contracts';
 
 import { launchTestContract } from './utils';
 
@@ -12,7 +12,7 @@ import { launchTestContract } from './utils';
 describe('Auth Testing', () => {
   it('can get is_caller_external', async () => {
     using contractInstance = await launchTestContract({
-      factory: AuthTestingContractFactory,
+      factory: ContractFactory,
     });
 
     const { waitForResult } = await contractInstance.functions.is_caller_external().call();
@@ -23,7 +23,7 @@ describe('Auth Testing', () => {
 
   it('can check_msg_sender [with correct id]', async () => {
     using launched = await launchTestNode({
-      contractsConfigs: [{ factory: AuthTestingContractFactory }],
+      contractsConfigs: [{ factory: ContractFactory }],
     });
 
     const {
@@ -42,7 +42,7 @@ describe('Auth Testing', () => {
 
   it('can check_msg_sender [with incorrect id]', async () => {
     using contractInstance = await launchTestContract({
-      factory: AuthTestingContractFactory,
+      factory: ContractFactory,
     });
 
     await expect(

packages/fuel-gauge/src/predicate/predicate-general.test.ts

@@ -1,8 +1,8 @@
-import type { BN, FakeResources } from 'fuels';
-import { Address, Predicate, ScriptTransactionRequest, bn } from 'fuels';
+import type { FakeResources } from 'fuels';
+import { Address, ScriptTransactionRequest, bn } from 'fuels';
 import { ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils';
 
-import { PredicateSum } from '../../test/typegen';
+import { Predicate } from '../../test/typegen';
 
 /**
  * @group node
@@ -28,9 +28,7 @@ describe('Predicate', () => {
     const value2 = bn(200);
     const value1 = bn(100);
 
-    const predicate = new Predicate<[BN, BN]>({
-      abi: PredicateSum.abi,
-      bytecode: PredicateSum.bytecode,
+    const predicate = new Predicate({
       provider,
       data: [value1, value2],
     });

packages/fuel-gauge/src/script-main-args.test.ts

@@ -1,8 +1,8 @@
 import type { BigNumberish } from 'fuels';
-import { bn, Script } from 'fuels';
+import { bn, Script as FuelScript } from 'fuels';
 import { launchTestNode } from 'fuels/test-utils';
 
-import { ScriptMainArgs, ScriptMainReturnStruct, ScriptMainTwoArgs } from '../test/typegen';
+import { ScriptMainArgs, ScriptMainReturnStruct, Script } from '../test/typegen';
 
 type Baz = {
   x: number;
@@ -20,7 +20,7 @@ describe('Script Coverage', () => {
     } = launched;
 
     const foo = 33;
-    const scriptInstance = new Script<BigNumberish[], BigNumberish>(
+    const scriptInstance = new FuelScript<BigNumberish[], BigNumberish>(
       ScriptMainArgs.bytecode,
       ScriptMainArgs.abi,
       wallet
@@ -40,7 +40,7 @@ describe('Script Coverage', () => {
       wallets: [wallet],
     } = launched;
 
-    const scriptInstance = new ScriptMainTwoArgs(wallet);
+    const scriptInstance = new Script(wallet);
     const foo = 33;
     const bar: Baz = {
       x: 12,
@@ -79,7 +79,7 @@ describe('Script Coverage', () => {
       wallets: [wallet],
     } = launched;
 
-    const scriptInstance = new Script<BigNumberish[], BigNumberish>(
+    const scriptInstance = new FuelScript<BigNumberish[], BigNumberish>(
       ScriptMainArgs.bytecode,
       ScriptMainArgs.abi,
       wallet

packages/fuel-gauge/test/fixtures/forc-projects/Forc.toml

@@ -5,8 +5,7 @@ members = [
   "advanced-logging-abi",
   "advanced-logging-other-contract",
   "advanced-logging-other-contract-abi",
-  "auth_testing_abi",
-  "auth_testing_contract",
+  "contract",
   "bytecode-sway-lib",
   "bytes-contract",
   "call-test-contract",
@@ -22,6 +21,7 @@ members = [
   "smo-contract",
   "options",
   "payable-annotation",
+  "predicate",
   "predicate-address",
   "predicate-assert-number",
   "predicate-assert-value",
@@ -35,7 +35,6 @@ members = [
   "predicate-raw-slice",
   "predicate-std-lib-string",
   "predicate-str-slice",
-  "predicate-sum",
   "predicate-triple-sig",
   "predicate-true",
   "predicate-u32",
@@ -55,7 +54,7 @@ members = [
   "script-main-arg-bool",
   "script-main-args",
   "script-main-return-struct",
-  "script-main-two-args",
+  "script",
   "script-raw-slice",
   "script-std-lib-string",
   "script-str-slice",

packages/fuel-gauge/test/fixtures/forc-projects/auth_testing_abi/src/main.sw

@@ -1,6 +1,6 @@
 [project]
 authors = ["Fuel Labs <[email protected]>"]
 license = "Apache-2.0"
-name = "auth_testing_abi"
+name = "contract"
 
 [dependencies]

packages/fuel-gauge/test/fixtures/forc-projects/auth_testing_contract/Forc.toml

@@ -1,9 +1,13 @@
 contract;
 
 use std::auth::{AuthError, caller_is_external, msg_sender};
-use auth_testing_abi::*;
 
-impl AuthTesting for Contract {
+abi Contract {
+    fn is_caller_external() -> bool;
+    fn check_msg_sender(expected_id: Address) -> bool;
+}
+
+impl Contract for Contract {
     fn is_caller_external() -> bool {
         caller_is_external()
     }

packages/fuel-gauge/test/fixtures/forc-projects/auth_testing_abi/Forc.toml renamed to packages/fuel-gauge/test/fixtures/forc-projects/contract/Forc.toml

@@ -2,6 +2,6 @@
 authors = ["Fuel Labs <[email protected]>"]
 entry = "main.sw"
 license = "Apache-2.0"
-name = "predicate-sum"
+name = "predicate"
 
 [dependencies]

packages/fuel-gauge/test/fixtures/forc-projects/auth_testing_contract/src/main.sw renamed to packages/fuel-gauge/test/fixtures/forc-projects/contract/src/main.sw

@@ -1,6 +1,6 @@
 [project]
 authors = ["Fuel Labs <[email protected]>"]
 license = "Apache-2.0"
-name = "script-main-two-args"
+name = "script"
 
 [dependencies]