@harmoniclabs/pebble 0.1.3-dev0 → 0.1.3-dev2

package/dist/tokenizer/Token.d.ts

@@ -41,129 +41,130 @@ export declare enum Token {
     Test = 38,
     Fail = 39,
     Assert = 40,
-    Contract = 41,
-    Param = 42,
-    Spend = 43,
-    Mint = 44,
-    Certify = 45,
-    Withdraw = 46,
-    Propose = 47,
-    Vote = 48,
-    Context = 49,
+    Trace = 41,
+    Contract = 42,
+    Param = 43,
+    Spend = 44,
+    Mint = 45,
+    Certify = 46,
+    Withdraw = 47,
+    Propose = 48,
+    Vote = 49,
+    Context = 50,
     /** `{` */
-    OpenBrace = 50,
+    OpenBrace = 51,
     /** `}` */
-    CloseBrace = 51,
-    OpenParen = 52,
-    CloseParen = 53,
+    CloseBrace = 52,
+    OpenParen = 53,
+    CloseParen = 54,
     /** `[` */
-    OpenBracket = 54,
+    OpenBracket = 55,
     /** `]` */
-    CloseBracket = 55,
+    CloseBracket = 56,
     /** `.` */
-    Dot = 56,
+    Dot = 57,
     /** `...` */
-    Dot_Dot_Dot = 57,
+    Dot_Dot_Dot = 58,
     /** `;` */
-    Semicolon = 58,
+    Semicolon = 59,
     /** `,` */
-    Comma = 59,
+    Comma = 60,
     /** `<` */
-    LessThan = 60,
+    LessThan = 61,
     /** `>` */
-    GreaterThan = 61,
+    GreaterThan = 62,
     /** `<=` */
-    LessThan_Equals = 62,
+    LessThan_Equals = 63,
     /** `>=` */
-    GreaterThan_Equals = 63,
+    GreaterThan_Equals = 64,
     /** `==` */
-    Equals_Equals = 64,
+    Equals_Equals = 65,
     /** `!=` */
-    Exclamation_Equals = 65,
+    Exclamation_Equals = 66,
     /** `===` */
-    Equals_Equals_Equals = 66,
+    Equals_Equals_Equals = 67,
     /** `!==` */
-    Exclamation_Equals_Equals = 67,
+    Exclamation_Equals_Equals = 68,
     /** `=>` */
-    FatArrow = 68,
+    FatArrow = 69,
     /** `+` */
-    Plus = 69,
+    Plus = 70,
     /** `-` */
-    Minus = 70,
+    Minus = 71,
     /** `**` */
-    Asterisk_Asterisk = 71,
+    Asterisk_Asterisk = 72,
     /** `*` */
-    Asterisk = 72,
+    Asterisk = 73,
     /** `/` */
-    Slash = 73,
+    Slash = 74,
     /** `%` */
-    Percent = 74,
+    Percent = 75,
     /** `++` */
-    Plus_Plus = 75,
+    Plus_Plus = 76,
     /** `--` */
-    Minus_Minus = 76,
+    Minus_Minus = 77,
     /** `<<` */
-    LessThan_LessThan = 77,
+    LessThan_LessThan = 78,
     /** `>>` */
-    GreaterThan_GreaterThan = 78,
+    GreaterThan_GreaterThan = 79,
     /** `>>>` */
-    GreaterThan_GreaterThan_GreaterThan = 79,
+    GreaterThan_GreaterThan_GreaterThan = 80,
     /** `+` */
-    Ampersand = 80,
+    Ampersand = 81,
     /** `|` */
-    Bar = 81,
+    Bar = 82,
     /** `^` */
-    Caret = 82,
+    Caret = 83,
     /** `!` */
-    Exclamation = 83,
+    Exclamation = 84,
     /** `~` */
-    Tilde = 84,
+    Tilde = 85,
     /** `&&` */
-    Ampersand_Ampersand = 85,
+    Ampersand_Ampersand = 86,
     /** `||` */
-    Bar_Bar = 86,
+    Bar_Bar = 87,
     /** `?` */
-    Question = 87,
+    Question = 88,
     /** `:` */
-    Colon = 88,
+    Colon = 89,
     /** `=` */
-    Equals = 89,
-    Plus_Equals = 90,
-    Minus_Equals = 91,
-    Asterisk_Equals = 92,
-    Asterisk_Asterisk_Equals = 93,
-    Slash_Equals = 94,
-    Percent_Equals = 95,
-    LessThan_LessThan_Equals = 96,
-    GreaterThan_GreaterThan_Equals = 97,
-    GreaterThan_GreaterThan_GreaterThan_Equals = 98,
-    Ampersand_Equals = 99,
-    Bar_Equals = 100,
-    Caret_Equals = 101,
-    At = 102,
+    Equals = 90,
+    Plus_Equals = 91,
+    Minus_Equals = 92,
+    Asterisk_Equals = 93,
+    Asterisk_Asterisk_Equals = 94,
+    Slash_Equals = 95,
+    Percent_Equals = 96,
+    LessThan_LessThan_Equals = 97,
+    GreaterThan_GreaterThan_Equals = 98,
+    GreaterThan_GreaterThan_GreaterThan_Equals = 99,
+    Ampersand_Equals = 100,
+    Bar_Equals = 101,
+    Caret_Equals = 102,
+    At = 103,
     /** `??=` */
-    Question_Question_Equals = 103,
+    Question_Question_Equals = 104,
     /** `||=` */
-    Bar_Bar_Equals = 104,
+    Bar_Bar_Equals = 105,
     /** `&&=` */
-    Ampersand_Ampersand_Equals = 105,
+    Ampersand_Ampersand_Equals = 106,
     /** `??` */
-    Question_Question = 106,
+    Question_Question = 107,
     /** `?.` */
-    Question_Dot = 107,
+    Question_Dot = 108,
     /** `!.` */
-    Exclamation_Dot = 108,
-    Data = 109,
-    Bytes = 110,
-    Optional = 111,
-    List = 112,
-    LinearMap = 113,
-    Runtime = 114,
-    Identifier = 115,
-    StringLiteral = 116,
-    HexBytesLiteral = 117,
-    IntegerLiteral = 118,
-    StringTemplateLiteralQuote = 119,
-    Invalid = 120,
-    EndOfFile = 121
+    Exclamation_Dot = 109,
+    Data = 110,
+    Bytes = 111,
+    Optional = 112,
+    List = 113,
+    LinearMap = 114,
+    Runtime = 115,
+    Identifier = 116,
+    StringLiteral = 117,
+    HexBytesLiteral = 118,
+    IntegerLiteral = 119,
+    StringTemplateLiteralQuote = 120,
+    Invalid = 121,
+    EndOfFile = 122
 }

package/dist/tokenizer/Token.js

@@ -78,139 +78,140 @@ export var Token;
     Token[Token["Test"] = 38] = "Test";
     Token[Token["Fail"] = 39] = "Fail";
     Token[Token["Assert"] = 40] = "Assert";
+    Token[Token["Trace"] = 41] = "Trace";
     // contract keywords
-    Token[Token["Contract"] = 41] = "Contract";
-    Token[Token["Param"] = 42] = "Param";
-    Token[Token["Spend"] = 43] = "Spend";
-    Token[Token["Mint"] = 44] = "Mint";
-    Token[Token["Certify"] = 45] = "Certify";
-    Token[Token["Withdraw"] = 46] = "Withdraw";
-    Token[Token["Propose"] = 47] = "Propose";
-    Token[Token["Vote"] = 48] = "Vote";
-    Token[Token["Context"] = 49] = "Context";
+    Token[Token["Contract"] = 42] = "Contract";
+    Token[Token["Param"] = 43] = "Param";
+    Token[Token["Spend"] = 44] = "Spend";
+    Token[Token["Mint"] = 45] = "Mint";
+    Token[Token["Certify"] = 46] = "Certify";
+    Token[Token["Withdraw"] = 47] = "Withdraw";
+    Token[Token["Propose"] = 48] = "Propose";
+    Token[Token["Vote"] = 49] = "Vote";
+    Token[Token["Context"] = 50] = "Context";
     // punctuation
     /** `{` */
-    Token[Token["OpenBrace"] = 50] = "OpenBrace";
+    Token[Token["OpenBrace"] = 51] = "OpenBrace";
     /** `}` */
-    Token[Token["CloseBrace"] = 51] = "CloseBrace";
-    Token[Token["OpenParen"] = 52] = "OpenParen";
-    Token[Token["CloseParen"] = 53] = "CloseParen";
+    Token[Token["CloseBrace"] = 52] = "CloseBrace";
+    Token[Token["OpenParen"] = 53] = "OpenParen";
+    Token[Token["CloseParen"] = 54] = "CloseParen";
     /** `[` */
-    Token[Token["OpenBracket"] = 54] = "OpenBracket";
+    Token[Token["OpenBracket"] = 55] = "OpenBracket";
     /** `]` */
-    Token[Token["CloseBracket"] = 55] = "CloseBracket";
+    Token[Token["CloseBracket"] = 56] = "CloseBracket";
     /** `.` */
-    Token[Token["Dot"] = 56] = "Dot";
+    Token[Token["Dot"] = 57] = "Dot";
     /** `...` */
-    Token[Token["Dot_Dot_Dot"] = 57] = "Dot_Dot_Dot";
+    Token[Token["Dot_Dot_Dot"] = 58] = "Dot_Dot_Dot";
     /** `;` */
-    Token[Token["Semicolon"] = 58] = "Semicolon";
+    Token[Token["Semicolon"] = 59] = "Semicolon";
     /** `,` */
-    Token[Token["Comma"] = 59] = "Comma";
+    Token[Token["Comma"] = 60] = "Comma";
     /** `<` */
-    Token[Token["LessThan"] = 60] = "LessThan";
+    Token[Token["LessThan"] = 61] = "LessThan";
     /** `>` */
-    Token[Token["GreaterThan"] = 61] = "GreaterThan";
+    Token[Token["GreaterThan"] = 62] = "GreaterThan";
     /** `<=` */
-    Token[Token["LessThan_Equals"] = 62] = "LessThan_Equals";
+    Token[Token["LessThan_Equals"] = 63] = "LessThan_Equals";
     /** `>=` */
-    Token[Token["GreaterThan_Equals"] = 63] = "GreaterThan_Equals";
+    Token[Token["GreaterThan_Equals"] = 64] = "GreaterThan_Equals";
     /** `==` */
-    Token[Token["Equals_Equals"] = 64] = "Equals_Equals";
+    Token[Token["Equals_Equals"] = 65] = "Equals_Equals";
     /** `!=` */
-    Token[Token["Exclamation_Equals"] = 65] = "Exclamation_Equals";
+    Token[Token["Exclamation_Equals"] = 66] = "Exclamation_Equals";
     /** `===` */
-    Token[Token["Equals_Equals_Equals"] = 66] = "Equals_Equals_Equals";
+    Token[Token["Equals_Equals_Equals"] = 67] = "Equals_Equals_Equals";
     /** `!==` */
-    Token[Token["Exclamation_Equals_Equals"] = 67] = "Exclamation_Equals_Equals";
+    Token[Token["Exclamation_Equals_Equals"] = 68] = "Exclamation_Equals_Equals";
     /** `=>` */
-    Token[Token["FatArrow"] = 68] = "FatArrow";
+    Token[Token["FatArrow"] = 69] = "FatArrow";
     /** `+` */
-    Token[Token["Plus"] = 69] = "Plus";
+    Token[Token["Plus"] = 70] = "Plus";
     /** `-` */
-    Token[Token["Minus"] = 70] = "Minus";
+    Token[Token["Minus"] = 71] = "Minus";
     /** `**` */
-    Token[Token["Asterisk_Asterisk"] = 71] = "Asterisk_Asterisk";
+    Token[Token["Asterisk_Asterisk"] = 72] = "Asterisk_Asterisk";
     /** `*` */
-    Token[Token["Asterisk"] = 72] = "Asterisk";
+    Token[Token["Asterisk"] = 73] = "Asterisk";
     /** `/` */
-    Token[Token["Slash"] = 73] = "Slash";
+    Token[Token["Slash"] = 74] = "Slash";
     /** `%` */
-    Token[Token["Percent"] = 74] = "Percent";
+    Token[Token["Percent"] = 75] = "Percent";
     /** `++` */
-    Token[Token["Plus_Plus"] = 75] = "Plus_Plus";
+    Token[Token["Plus_Plus"] = 76] = "Plus_Plus";
     /** `--` */
-    Token[Token["Minus_Minus"] = 76] = "Minus_Minus";
+    Token[Token["Minus_Minus"] = 77] = "Minus_Minus";
     /** `<<` */
-    Token[Token["LessThan_LessThan"] = 77] = "LessThan_LessThan";
+    Token[Token["LessThan_LessThan"] = 78] = "LessThan_LessThan";
     /** `>>` */
-    Token[Token["GreaterThan_GreaterThan"] = 78] = "GreaterThan_GreaterThan";
+    Token[Token["GreaterThan_GreaterThan"] = 79] = "GreaterThan_GreaterThan";
     /** `>>>` */
-    Token[Token["GreaterThan_GreaterThan_GreaterThan"] = 79] = "GreaterThan_GreaterThan_GreaterThan";
+    Token[Token["GreaterThan_GreaterThan_GreaterThan"] = 80] = "GreaterThan_GreaterThan_GreaterThan";
     /** `+` */
-    Token[Token["Ampersand"] = 80] = "Ampersand";
+    Token[Token["Ampersand"] = 81] = "Ampersand";
     /** `|` */
-    Token[Token["Bar"] = 81] = "Bar";
+    Token[Token["Bar"] = 82] = "Bar";
     /** `^` */
-    Token[Token["Caret"] = 82] = "Caret";
+    Token[Token["Caret"] = 83] = "Caret";
     /** `!` */
-    Token[Token["Exclamation"] = 83] = "Exclamation";
+    Token[Token["Exclamation"] = 84] = "Exclamation";
     /** `~` */
-    Token[Token["Tilde"] = 84] = "Tilde";
+    Token[Token["Tilde"] = 85] = "Tilde";
     /** `&&` */
-    Token[Token["Ampersand_Ampersand"] = 85] = "Ampersand_Ampersand";
+    Token[Token["Ampersand_Ampersand"] = 86] = "Ampersand_Ampersand";
     /** `||` */
-    Token[Token["Bar_Bar"] = 86] = "Bar_Bar";
+    Token[Token["Bar_Bar"] = 87] = "Bar_Bar";
     /** `?` */
-    Token[Token["Question"] = 87] = "Question";
+    Token[Token["Question"] = 88] = "Question";
     /** `:` */
-    Token[Token["Colon"] = 88] = "Colon";
+    Token[Token["Colon"] = 89] = "Colon";
     /** `=` */
-    Token[Token["Equals"] = 89] = "Equals";
-    Token[Token["Plus_Equals"] = 90] = "Plus_Equals";
-    Token[Token["Minus_Equals"] = 91] = "Minus_Equals";
-    Token[Token["Asterisk_Equals"] = 92] = "Asterisk_Equals";
-    Token[Token["Asterisk_Asterisk_Equals"] = 93] = "Asterisk_Asterisk_Equals";
-    Token[Token["Slash_Equals"] = 94] = "Slash_Equals";
-    Token[Token["Percent_Equals"] = 95] = "Percent_Equals";
-    Token[Token["LessThan_LessThan_Equals"] = 96] = "LessThan_LessThan_Equals";
-    Token[Token["GreaterThan_GreaterThan_Equals"] = 97] = "GreaterThan_GreaterThan_Equals";
-    Token[Token["GreaterThan_GreaterThan_GreaterThan_Equals"] = 98] = "GreaterThan_GreaterThan_GreaterThan_Equals";
-    Token[Token["Ampersand_Equals"] = 99] = "Ampersand_Equals";
-    Token[Token["Bar_Equals"] = 100] = "Bar_Equals";
-    Token[Token["Caret_Equals"] = 101] = "Caret_Equals";
-    Token[Token["At"] = 102] = "At";
+    Token[Token["Equals"] = 90] = "Equals";
+    Token[Token["Plus_Equals"] = 91] = "Plus_Equals";
+    Token[Token["Minus_Equals"] = 92] = "Minus_Equals";
+    Token[Token["Asterisk_Equals"] = 93] = "Asterisk_Equals";
+    Token[Token["Asterisk_Asterisk_Equals"] = 94] = "Asterisk_Asterisk_Equals";
+    Token[Token["Slash_Equals"] = 95] = "Slash_Equals";
+    Token[Token["Percent_Equals"] = 96] = "Percent_Equals";
+    Token[Token["LessThan_LessThan_Equals"] = 97] = "LessThan_LessThan_Equals";
+    Token[Token["GreaterThan_GreaterThan_Equals"] = 98] = "GreaterThan_GreaterThan_Equals";
+    Token[Token["GreaterThan_GreaterThan_GreaterThan_Equals"] = 99] = "GreaterThan_GreaterThan_GreaterThan_Equals";
+    Token[Token["Ampersand_Equals"] = 100] = "Ampersand_Equals";
+    Token[Token["Bar_Equals"] = 101] = "Bar_Equals";
+    Token[Token["Caret_Equals"] = 102] = "Caret_Equals";
+    Token[Token["At"] = 103] = "At";
     /** `??=` */
-    Token[Token["Question_Question_Equals"] = 103] = "Question_Question_Equals";
+    Token[Token["Question_Question_Equals"] = 104] = "Question_Question_Equals";
     /** `||=` */
-    Token[Token["Bar_Bar_Equals"] = 104] = "Bar_Bar_Equals";
+    Token[Token["Bar_Bar_Equals"] = 105] = "Bar_Bar_Equals";
     /** `&&=` */
-    Token[Token["Ampersand_Ampersand_Equals"] = 105] = "Ampersand_Ampersand_Equals";
+    Token[Token["Ampersand_Ampersand_Equals"] = 106] = "Ampersand_Ampersand_Equals";
     /** `??` */
-    Token[Token["Question_Question"] = 106] = "Question_Question";
+    Token[Token["Question_Question"] = 107] = "Question_Question";
     /** `?.` */
-    Token[Token["Question_Dot"] = 107] = "Question_Dot";
+    Token[Token["Question_Dot"] = 108] = "Question_Dot";
     /** `!.` */
-    Token[Token["Exclamation_Dot"] = 108] = "Exclamation_Dot";
+    Token[Token["Exclamation_Dot"] = 109] = "Exclamation_Dot";
     // custom native types for pebble
-    Token[Token["Data"] = 109] = "Data";
-    Token[Token["Bytes"] = 110] = "Bytes";
-    Token[Token["Optional"] = 111] = "Optional";
-    Token[Token["List"] = 112] = "List";
-    Token[Token["LinearMap"] = 113] = "LinearMap";
+    Token[Token["Data"] = 110] = "Data";
+    Token[Token["Bytes"] = 111] = "Bytes";
+    Token[Token["Optional"] = 112] = "Optional";
+    Token[Token["List"] = 113] = "List";
+    Token[Token["LinearMap"] = 114] = "LinearMap";
     // struct decl modifiers
     // taggedModifier,     // `tagged` data struct
-    Token[Token["Runtime"] = 114] = "Runtime";
+    Token[Token["Runtime"] = 115] = "Runtime";
     // literals
-    Token[Token["Identifier"] = 115] = "Identifier";
-    Token[Token["StringLiteral"] = 116] = "StringLiteral";
-    Token[Token["HexBytesLiteral"] = 117] = "HexBytesLiteral";
-    Token[Token["IntegerLiteral"] = 118] = "IntegerLiteral";
+    Token[Token["Identifier"] = 116] = "Identifier";
+    Token[Token["StringLiteral"] = 117] = "StringLiteral";
+    Token[Token["HexBytesLiteral"] = 118] = "HexBytesLiteral";
+    Token[Token["IntegerLiteral"] = 119] = "IntegerLiteral";
     // FloatLiteral,
-    Token[Token["StringTemplateLiteralQuote"] = 119] = "StringTemplateLiteralQuote";
+    Token[Token["StringTemplateLiteralQuote"] = 120] = "StringTemplateLiteralQuote";
     // meta
-    Token[Token["Invalid"] = 120] = "Invalid";
-    Token[Token["EndOfFile"] = 121] = "EndOfFile";
+    Token[Token["Invalid"] = 121] = "Invalid";
+    Token[Token["EndOfFile"] = 122] = "EndOfFile";
 })(Token || (Token = {}));
 Object.freeze(Token);
 /*

package/dist/tokenizer/utils/tokenFromKeyword.js

@@ -203,6 +203,8 @@ export function tokenFromKeyword(text) {
                     return Token.Type;
                 break;
             }
+            if (text === "trace")
+                return Token.Trace;
             // if (text === "try") return Token.Try;
             // if (text === "throw") return Token.Throw;
             // if (text === "typeof") return Token.TypeOf;

package/dist/utils/array/keepSortedArrInplace.js

@@ -23,6 +23,21 @@ export function keepSortedStrArrInplace(target, source) {
             }
             continue; // element is in source, check next without removing this
         }
+        // elem > fstSrc: source has elements not in target, advance source
+        if (elem > fstSrc) {
+            while (source.length > 0 && fstSrc < elem) {
+                fstSrc = source.shift();
+            }
+            if (fstSrc === elem) {
+                fstSrc = source.shift();
+                if (!fstSrc) {
+                    target.length = i + 1;
+                    return target;
+                }
+                continue;
+            }
+            // fstSrc > elem or source exhausted: elem not in source, fall through to remove
+        }
         // not equal, remove the element
         target.splice(i, 1);
         i--; // adjust index since we removed an element

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harmoniclabs/pebble",
-  "version": "0.1.3-dev0",
+  "version": "0.1.3-dev2",
   "description": "A simple, yet rock solid, functional language with an imperative bias, targeting UPLC",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -51,25 +51,22 @@
   "homepage": "https://github.com/HarmonicLabs/pebble#readme",
   "dependencies": {
     "@harmoniclabs/bigint-utils": "^1.0.0",
-    "@harmoniclabs/bytestring": "^1.0.0",
-    "@harmoniclabs/cbor": "^1.6.6",
+    "@harmoniclabs/cardano-costmodels-ts": "^1.4.0",
+    "@harmoniclabs/cbor": "^2.0.1",
     "@harmoniclabs/crypto": "^0.3.0",
     "@harmoniclabs/obj-utils": "^1.0.0",
-    "@harmoniclabs/pair": "^1.0.0",
-    "@harmoniclabs/plutus-data": "^1.2.6",
-    "@harmoniclabs/plutus-machine": "^2.1.1",
+    "@harmoniclabs/plutus-data": "^2.0.1",
+    "@harmoniclabs/plutus-machine": "^3.0.0",
     "@harmoniclabs/uint8array-utils": "^1.0.4",
-    "@harmoniclabs/uplc": "^1.4.1"
+    "@harmoniclabs/uplc": "^2.0.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
-    "@harmoniclabs/cardano-ledger-ts": "^0.3.2",
     "@types/jest": "^28.1.4",
     "@types/node": "^18.14.6",
     "jest": "^29.4.3",
-    "jest-environment-jsdom": "^29.4.3",
+    "jest-environment-jsdom": "^30.3.0",
     "tsc-alias": "^1.7.1",
     "typescript": "^4.6.3"
   },