Merge pull request #1325 from demergent-labs/js_refactor

Js refactor

canisters/icrc/errors.ts

@@ -1,4 +1,4 @@
-import { nat, Record, text } from '../../src/lib_functional';
+import { nat, Record, text } from '../../src/lib';
 
 export const BadFee = Record({
     expected_fee: nat

canisters/icrc/icrc_1.ts

@@ -9,7 +9,7 @@ import {
     Record,
     text,
     Variant
-} from '../../src/lib_functional';
+} from '../../src/lib';
 import {
     BadBurn,
     BadFee,

canisters/icrc/icrc_2.ts

@@ -1,13 +1,4 @@
-import {
-    blob,
-    nat,
-    nat64,
-    Null,
-    Opt,
-    Principal,
-    Record,
-    Variant
-} from '../../src/lib_functional';
+import { blob, nat, nat64, Null, Opt, Record, Variant } from '../../src/lib';
 
 import {
     BadFee,

canisters/icrc/index.ts

@@ -9,7 +9,7 @@ import {
     text,
     Tuple,
     Vec
-} from '../../src/lib_functional';
+} from '../../src/lib';
 import { Account, TransferArgs, TransferResult, Value } from './icrc_1';
 import {
     AllowanceArgs,

canisters/ledger/index.ts

@@ -24,7 +24,7 @@ import {
     Vec,
     Principal,
     Func
-} from '../../src/lib_functional';
+} from '../../src/lib';
 import * as icrc from '../icrc';
 
 // Amount of tokens, measured in 10^-8 of a token.

canisters/management/bitcoin.ts

@@ -10,7 +10,7 @@ import {
     text,
     Variant,
     Vec
-} from '../../src/lib_functional';
+} from '../../src/lib';
 
 export type BitcoinAddress = text;
 export const BitcoinAddress = text;

canisters/management/canister_info.ts

@@ -13,7 +13,7 @@ import {
     nat64,
     nat8,
     Null
-} from '../../src/lib_functional';
+} from '../../src/lib';
 import { managementCanister } from '.';
 
 /** Argument type of {@link managementCanister.canister_info}. */

canisters/management/canister_management.ts

@@ -7,7 +7,7 @@ import {
     Variant,
     Null,
     blob
-} from '../../src/lib_functional';
+} from '../../src/lib';
 
 export const CanisterId = Principal;
 export const UserId = Principal;

canisters/management/http_request.ts

@@ -9,7 +9,7 @@ import {
     nat64,
     nat,
     Func
-} from '../../src/lib_functional';
+} from '../../src/lib';
 
 export const HttpHeader = Record({
     name: text,

canisters/management/index.ts

@@ -4,14 +4,7 @@
 //
 // Some documentation changed from original work.
 
-import {
-    blob,
-    Canister,
-    Principal,
-    update,
-    Vec,
-    Void
-} from '../../src/lib_functional';
+import { blob, Canister, Principal, update, Vec, Void } from '../../src/lib';
 import {
     GetBalanceArgs,
     GetCurrentFeePercentilesArgs,

canisters/management/t_ecdsa.ts

@@ -7,7 +7,7 @@ import {
     text,
     Variant,
     Vec
-} from '../../src/lib_functional';
+} from '../../src/lib';
 
 export const EcdsaCurve = Variant({
     secp256k1: Null

examples/audio_recorder/src/index.did

@@ -1,21 +1,10 @@
-type rec_2 = record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64};
-type rec_3 = record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64};
-type rec_4 = record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64};
-type rec_5 = record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64};
-type rec_6 = variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal};
-type rec_7 = record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64};
-type rec_8 = variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal};
-type rec_9 = record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64};
-type rec_10 = record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64};
-type rec_11 = record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64};
-type rec_12 = variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal};
 service: () -> {
-    createUser: (text) -> (rec_2);
-    readUsers: () -> (vec rec_3) query;
-    readUserById: (principal) -> (opt rec_4) query;
-    deleteUser: (principal) -> (variant {Ok:rec_5; Err:rec_6});
-    createRecording: (vec nat8, text, principal) -> (variant {Ok:rec_7; Err:rec_8});
-    readRecordings: () -> (vec rec_9) query;
-    readRecordingById: (principal) -> (opt rec_10) query;
-    deleteRecording: (principal) -> (variant {Ok:rec_11; Err:rec_12});
+    createRecording: (vec nat8, text, principal) -> (variant {Ok:record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64}; Err:variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal}});
+    createUser: (text) -> (record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64});
+    deleteRecording: (principal) -> (variant {Ok:record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64}; Err:variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal}});
+    deleteUser: (principal) -> (variant {Ok:record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64}; Err:variant {RecordingDoesNotExist:principal; UserDoesNotExist:principal}});
+    readRecordingById: (principal) -> (opt record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64}) query;
+    readRecordings: () -> (vec record {id:principal; audio:vec nat8; userId:principal; name:text; createdAt:nat64}) query;
+    readUserById: (principal) -> (opt record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64}) query;
+    readUsers: () -> (vec record {id:principal; username:text; recordingIds:vec principal; createdAt:nat64}) query;
 }

examples/icrc/canisters/proxy/index.did

@@ -1,56 +1,15 @@
-type rec_41 = variant {Int:int; Nat:nat; Blob:vec nat8; Text:text};
-type rec_42 = record {owner:principal; subaccount:opt vec nat8};
-type rec_43 = record {owner:principal; subaccount:opt vec nat8};
-type rec_45 = record {owner:principal; subaccount:opt vec nat8};
-type rec_44 = record {to:rec_45; fee:opt nat; memo:opt vec nat8; from_subaccount:opt vec nat8; created_at_time:opt nat64; amount:nat};
-type rec_53 = record {message:text; error_code:nat};
-type rec_49 = record {min_burn_amount:nat};
-type rec_52 = record {duplicate_of:nat};
-type rec_48 = record {expected_fee:nat};
-type rec_51 = record {ledger_time:nat64};
-type rec_50 = record {balance:nat};
-type rec_47 = variant {GenericError:rec_53; TemporarilyUnavailable; BadBurn:rec_49; Duplicate:rec_52; BadFee:rec_48; CreatedInFuture:rec_51; TooOld; InsufficientFunds:rec_50};
-type rec_46 = variant {Ok:nat; Err:rec_47};
-type rec_54 = record {url:text; name:text};
-type rec_56 = record {owner:principal; subaccount:opt vec nat8};
-type rec_55 = record {fee:opt nat; memo:opt vec nat8; from_subaccount:opt vec nat8; created_at_time:opt nat64; amount:nat; expected_allowance:opt nat; expires_at:opt nat64; spender:rec_56};
-type rec_65 = record {message:text; error_code:nat};
-type rec_64 = record {duplicate_of:nat};
-type rec_59 = record {expected_fee:nat};
-type rec_61 = record {current_allowance:nat};
-type rec_63 = record {ledger_time:nat64};
-type rec_62 = record {ledger_time:nat64};
-type rec_60 = record {balance:nat};
-type rec_58 = variant {GenericError:rec_65; TemporarilyUnavailable; Duplicate:rec_64; BadFee:rec_59; AllowanceChanged:rec_61; CreatedInFuture:rec_63; TooOld; Expired:rec_62; InsufficientFunds:rec_60};
-type rec_57 = variant {Ok:nat; Err:rec_58};
-type rec_68 = record {owner:principal; subaccount:opt vec nat8};
-type rec_67 = record {owner:principal; subaccount:opt vec nat8};
-type rec_66 = record {to:rec_68; fee:opt nat; from:rec_67; memo:opt vec nat8; created_at_time:opt nat64; amount:nat};
-type rec_77 = record {message:text; error_code:nat};
-type rec_74 = record {allowance:nat};
-type rec_72 = record {min_burn_amount:nat};
-type rec_76 = record {duplicate_of:nat};
-type rec_71 = record {expected_fee:nat};
-type rec_75 = record {ledger_time:nat64};
-type rec_73 = record {balance:nat};
-type rec_70 = variant {GenericError:rec_77; TemporarilyUnavailable; InsufficientAllowance:rec_74; BadBurn:rec_72; Duplicate:rec_76; BadFee:rec_71; CreatedInFuture:rec_75; TooOld; InsufficientFunds:rec_73};
-type rec_69 = variant {Ok:nat; Err:rec_70};
-type rec_79 = record {owner:principal; subaccount:opt vec nat8};
-type rec_80 = record {owner:principal; subaccount:opt vec nat8};
-type rec_78 = record {account:rec_79; spender:rec_80};
-type rec_81 = record {allowance:nat; expires_at:opt nat64};
 service: () -> {
-    icrc1_metadata: () -> (vec record {text; rec_41}) query;
-    icrc1_name: () -> (text) query;
+    icrc1_balance_of: (record {owner:principal; subaccount:opt vec nat8}) -> (nat) query;
     icrc1_decimals: () -> (nat8) query;
-    icrc1_symbol: () -> (text) query;
     icrc1_fee: () -> (nat) query;
+    icrc1_metadata: () -> (vec record {text; variant {Int:int; Nat:nat; Blob:vec nat8; Text:text}}) query;
+    icrc1_minting_account: () -> (opt record {owner:principal; subaccount:opt vec nat8}) query;
+    icrc1_name: () -> (text) query;
+    icrc1_supported_standards: () -> (vec record {url:text; name:text}) query;
+    icrc1_symbol: () -> (text) query;
     icrc1_total_supply: () -> (nat) query;
-    icrc1_minting_account: () -> (opt rec_42) query;
-    icrc1_balance_of: (rec_43) -> (nat) query;
-    icrc1_transfer: (rec_44) -> (rec_46);
-    icrc1_supported_standards: () -> (vec rec_54) query;
-    icrc2_approve: (rec_55) -> (rec_57);
-    icrc2_transfer_from: (rec_66) -> (rec_69);
-    icrc2_allowance: (rec_78) -> (rec_81);
+    icrc1_transfer: (record {to:record {owner:principal; subaccount:opt vec nat8}; fee:opt nat; memo:opt vec nat8; from_subaccount:opt vec nat8; created_at_time:opt nat64; amount:nat}) -> (variant {Ok:nat; Err:variant {GenericError:record {message:text; error_code:nat}; TemporarilyUnavailable; BadBurn:record {min_burn_amount:nat}; Duplicate:record {duplicate_of:nat}; BadFee:record {expected_fee:nat}; CreatedInFuture:record {ledger_time:nat64}; TooOld; InsufficientFunds:record {balance:nat}}});
+    icrc2_allowance: (record {account:record {owner:principal; subaccount:opt vec nat8}; spender:record {owner:principal; subaccount:opt vec nat8}}) -> (record {allowance:nat; expires_at:opt nat64});
+    icrc2_approve: (record {fee:opt nat; memo:opt vec nat8; from_subaccount:opt vec nat8; created_at_time:opt nat64; amount:nat; expected_allowance:opt nat; expires_at:opt nat64; spender:record {owner:principal; subaccount:opt vec nat8}}) -> (variant {Ok:nat; Err:variant {GenericError:record {message:text; error_code:nat}; TemporarilyUnavailable; Duplicate:record {duplicate_of:nat}; BadFee:record {expected_fee:nat}; AllowanceChanged:record {current_allowance:nat}; CreatedInFuture:record {ledger_time:nat64}; TooOld; Expired:record {ledger_time:nat64}; InsufficientFunds:record {balance:nat}}});
+    icrc2_transfer_from: (record {to:record {owner:principal; subaccount:opt vec nat8}; fee:opt nat; from:record {owner:principal; subaccount:opt vec nat8}; memo:opt vec nat8; created_at_time:opt nat64; amount:nat}) -> (variant {Ok:nat; Err:variant {GenericError:record {message:text; error_code:nat}; TemporarilyUnavailable; InsufficientAllowance:record {allowance:nat}; BadBurn:record {min_burn_amount:nat}; Duplicate:record {duplicate_of:nat}; BadFee:record {expected_fee:nat}; CreatedInFuture:record {ledger_time:nat64}; TooOld; InsufficientFunds:record {balance:nat}}});
 }

examples/inspect_message/src/index.did

@@ -1,5 +1,5 @@
 service: () -> {
     accessible: () -> (bool);
-    inaccessible: () -> (bool);
     alsoInaccessible: () -> (bool);
+    inaccessible: () -> (bool);
 }

examples/rejections/src/rejections/index.did

@@ -1,11 +1,7 @@
-type rec_0 = variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject};
-type rec_1 = variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject};
-type rec_2 = variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject};
-type rec_3 = variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject};
 service: () -> {
-    getRejectionCodeNoError: () -> (rec_0);
-    getRejectionCodeDestinationInvalid: () -> (rec_1);
-    getRejectionCodeCanisterReject: () -> (rec_2);
-    getRejectionCodeCanisterError: () -> (rec_3);
+    getRejectionCodeCanisterError: () -> (variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject});
+    getRejectionCodeCanisterReject: () -> (variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject});
+    getRejectionCodeDestinationInvalid: () -> (variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject});
+    getRejectionCodeNoError: () -> (variant {NoError; CanisterError; SysTransient; DestinationInvalid; Unknown; SysFatal; CanisterReject});
     getRejectionMessage: (text) -> (text);
 }

examples/rejections/src/some_canister/index.did

@@ -1,5 +1,5 @@
 service: () -> {
-    reject: (text) -> (empty) query;
     accept: () -> (bool) query;
     error: () -> (empty) query;
+    reject: (text) -> (empty) query;
 }

examples/stable_memory/src/index.did

@@ -1,11 +1,11 @@
 service: () -> {
-    stableSize: () -> (nat32) query;
-    stable64Size: () -> (nat64) query;
-    stableGrow: (nat32) -> (nat32);
     stable64Grow: (nat64) -> (nat64);
-    stableWrite: (nat32, vec nat8) -> ();
-    stable64Write: (nat64, vec nat8) -> ();
-    stableRead: (nat32, nat32) -> (vec nat8) query;
     stable64Read: (nat64, nat64) -> (vec nat8) query;
+    stable64Size: () -> (nat64) query;
+    stable64Write: (nat64, vec nat8) -> ();
     stableBytes: () -> (vec nat8) query;
+    stableGrow: (nat32) -> (nat32);
+    stableRead: (nat32, nat32) -> (vec nat8) query;
+    stableSize: () -> (nat32) query;
+    stableWrite: (nat32, vec nat8) -> ();
 }

examples/stable_structures/src/canister1/index.did

@@ -1,21 +1,3 @@
-type rec_1 = variant {Sad; Happy};
-type rec_2 = variant {Sad; Happy};
-type rec_3 = variant {Sad; Happy};
-type rec_4 = variant {Sad; Happy};
-type rec_5 = variant {Sad; Happy};
-type rec_6 = variant {Sad; Happy};
-type rec_10 = record {title:text};
-type rec_9 = record {username:text; posts:vec rec_10};
-type rec_12 = record {title:text};
-type rec_11 = record {username:text; posts:vec rec_12};
-type rec_14 = record {title:text};
-type rec_13 = record {username:text; posts:vec rec_14};
-type rec_16 = record {title:text};
-type rec_15 = record {username:text; posts:vec rec_16};
-type rec_18 = record {title:text};
-type rec_17 = record {username:text; posts:vec rec_18};
-type rec_20 = record {title:text};
-type rec_19 = record {username:text; posts:vec rec_20};
 service: () -> {
     getRedeployed: () -> (bool) query;
     stableMap0ContainsKey: (nat8) -> (bool) query;
@@ -45,22 +27,22 @@ service: () -> {
     stableMap2Len: () -> (nat64) query;
     stableMap2Remove: (nat32) -> (opt nat);
     stableMap2Values: () -> (vec nat) query;
-    stableMap3ContainsKey: (rec_1) -> (bool) query;
-    stableMap3Get: (rec_2) -> (opt int) query;
-    stableMap3Insert: (rec_3, int) -> (opt int);
+    stableMap3ContainsKey: (variant {Sad; Happy}) -> (bool) query;
+    stableMap3Get: (variant {Sad; Happy}) -> (opt int) query;
+    stableMap3Insert: (variant {Sad; Happy}, int) -> (opt int);
     stableMap3IsEmpty: () -> (bool) query;
-    stableMap3Items: () -> (vec record {rec_4; int}) query;
-    stableMap3Keys: () -> (vec rec_5) query;
+    stableMap3Items: () -> (vec record {variant {Sad; Happy}; int}) query;
+    stableMap3Keys: () -> (vec variant {Sad; Happy}) query;
     stableMap3Len: () -> (nat64) query;
-    stableMap3Remove: (rec_6) -> (opt int);
+    stableMap3Remove: (variant {Sad; Happy}) -> (opt int);
     stableMap3Values: () -> (vec int) query;
-    stableMap4ContainsKey: (rec_9) -> (bool) query;
-    stableMap4Get: (rec_11) -> (opt float32) query;
-    stableMap4Insert: (rec_13, float32) -> (opt float32);
+    stableMap4ContainsKey: (record {username:text; posts:vec record {title:text}}) -> (bool) query;
+    stableMap4Get: (record {username:text; posts:vec record {title:text}}) -> (opt float32) query;
+    stableMap4Insert: (record {username:text; posts:vec record {title:text}}, float32) -> (opt float32);
     stableMap4IsEmpty: () -> (bool) query;
-    stableMap4Items: () -> (vec record {rec_15; float32}) query;
-    stableMap4Keys: () -> (vec rec_17) query;
+    stableMap4Items: () -> (vec record {record {username:text; posts:vec record {title:text}}; float32}) query;
+    stableMap4Keys: () -> (vec record {username:text; posts:vec record {title:text}}) query;
     stableMap4Len: () -> (nat64) query;
-    stableMap4Remove: (rec_19) -> (opt float32);
+    stableMap4Remove: (record {username:text; posts:vec record {title:text}}) -> (opt float32);
     stableMap4Values: () -> (vec float32) query;
 }

examples/stable_structures/src/canister3/index.did

@@ -1,21 +1,3 @@
-type rec_3 = record {title:text};
-type rec_2 = record {username:text; posts:vec rec_3};
-type rec_5 = record {title:text};
-type rec_4 = record {username:text; posts:vec rec_5};
-type rec_7 = record {title:text};
-type rec_6 = record {username:text; posts:vec rec_7};
-type rec_9 = record {title:text};
-type rec_8 = record {username:text; posts:vec rec_9};
-type rec_11 = record {title:text};
-type rec_10 = record {username:text; posts:vec rec_11};
-type rec_13 = record {title:text};
-type rec_12 = record {username:text; posts:vec rec_13};
-type rec_15 = variant {Sad; Happy};
-type rec_16 = variant {Sad; Happy};
-type rec_17 = variant {Sad; Happy};
-type rec_18 = variant {Sad; Happy};
-type rec_19 = variant {Sad; Happy};
-type rec_20 = variant {Sad; Happy};
 service: () -> {
     getRedeployed: () -> (bool) query;
     stableMap10ContainsKey: (float32) -> (bool) query;
@@ -28,23 +10,23 @@ service: () -> {
     stableMap10Remove: (float32) -> (opt opt bool);
     stableMap10Values: () -> (vec opt bool) query;
     stableMap11ContainsKey: (nat) -> (bool) query;
-    stableMap11Get: (nat) -> (opt rec_2) query;
-    stableMap11Insert: (nat, rec_4) -> (opt rec_6);
+    stableMap11Get: (nat) -> (opt record {username:text; posts:vec record {title:text}}) query;
+    stableMap11Insert: (nat, record {username:text; posts:vec record {title:text}}) -> (opt record {username:text; posts:vec record {title:text}});
     stableMap11IsEmpty: () -> (bool) query;
-    stableMap11Items: () -> (vec record {nat; rec_8}) query;
+    stableMap11Items: () -> (vec record {nat; record {username:text; posts:vec record {title:text}}}) query;
     stableMap11Keys: () -> (vec nat) query;
     stableMap11Len: () -> (nat64) query;
-    stableMap11Remove: (nat) -> (opt rec_10);
-    stableMap11Values: () -> (vec rec_12) query;
+    stableMap11Remove: (nat) -> (opt record {username:text; posts:vec record {title:text}});
+    stableMap11Values: () -> (vec record {username:text; posts:vec record {title:text}}) query;
     stableMap12ContainsKey: (vec nat8) -> (bool) query;
-    stableMap12Get: (vec nat8) -> (opt rec_15) query;
-    stableMap12Insert: (vec nat8, rec_16) -> (opt rec_17);
+    stableMap12Get: (vec nat8) -> (opt variant {Sad; Happy}) query;
+    stableMap12Insert: (vec nat8, variant {Sad; Happy}) -> (opt variant {Sad; Happy});
     stableMap12IsEmpty: () -> (bool) query;
-    stableMap12Items: () -> (vec record {vec nat8; rec_18}) query;
+    stableMap12Items: () -> (vec record {vec nat8; variant {Sad; Happy}}) query;
     stableMap12Keys: () -> (vec vec nat8) query;
     stableMap12Len: () -> (nat64) query;
-    stableMap12Remove: (vec nat8) -> (opt rec_19);
-    stableMap12Values: () -> (vec rec_20) query;
+    stableMap12Remove: (vec nat8) -> (opt variant {Sad; Happy});
+    stableMap12Values: () -> (vec variant {Sad; Happy}) query;
     stableMap13ContainsKey: (text) -> (bool) query;
     stableMap13Get: (text) -> (opt principal) query;
     stableMap13Insert: (text, principal) -> (opt principal);

examples/timers/src/timers.did

@@ -1,7 +1,5 @@
-type rec_0 = record {repeat:nat64; repeatCrossCanister:nat64; inline:nat64; capture:nat64; single:nat64; singleCrossCanister:nat64};
-type rec_1 = record {repeat:int8; repeatCrossCanister:vec nat8; inline:int8; capture:text; single:bool; singleCrossCanister:vec nat8};
 service: () -> {
     clearTimer: (nat64) -> ();
-    setTimers: (nat64, nat64) -> (rec_0);
-    statusReport: () -> (rec_1) query;
+    setTimers: (nat64, nat64) -> (record {repeat:nat64; repeatCrossCanister:nat64; inline:nat64; capture:nat64; single:nat64; singleCrossCanister:nat64});
+    statusReport: () -> (record {repeat:int8; repeatCrossCanister:vec nat8; inline:int8; capture:text; single:bool; singleCrossCanister:vec nat8}) query;
 }

package.json

@@ -12,7 +12,7 @@
     "bin": {
         "azle": "./bin.js"
     },
-    "main": "./src/lib_functional/index.ts",
+    "main": "./src/lib/index.ts",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/demergent-labs/azle.git"