Merge pull request #34 from TrueCarry/feat/string-generator

Add non writing to fs generator

Author: thekiba

index.ts

@@ -1,6 +1,5 @@
-import { generateCode } from "./src/main";
+export { generateCode, getTLBCode, getTLBCodeByAST, generateCodeByAST, generateCodeWithGenerator, generateCodeFromData } from "./src/main";
 export * from "./src/ast";
-export { generateCode, getTLBCode, getTLBCodeByAST, generateCodeByAST, generateCodeWithGenerator } from "./src/main";
 export { isBigInt as isBigIntForJson, isBigIntExpr as isBigIntExprForJson } from "./src/generators/typescript/utils";
 export { CodeGenerator } from "./src/generators/generator";
 export { TypescriptGenerator } from "./src/generators/typescript/generator";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton-community/tlb-codegen",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -27,5 +27,6 @@
     "crc-32": "^1.2.2",
     "meow": "^9.0.0",
     "ts-jest": "^29.1.1"
-  }
+  },
+  "packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c"
 }

src/ast.ts

@@ -73,10 +73,6 @@ export type TLBMathExprType = {
   initialExpr: TLBMathExpr;
 };
 
-export type TLBBoolType = {
-  kind: "TLBBoolType";
-};
-
 export type TLBCoinsType = {
   kind: "TLBCoinsType";
 }
@@ -97,6 +93,7 @@ export type TLBHashmapType = {
   key: TLBMathExprType;
   value: TLBFieldType;
   extra?: TLBFieldType;
+  directStore: boolean;
 }
 
 export type TLBCellType = {
@@ -127,6 +124,10 @@ export type TLBMultipleType = {
   times: TLBMathExpr;
 };
 
+export type TLBTupleType = {
+  kind: "TLBTupleType";
+}
+
 export type TLBCondType = {
   kind: "TLBCondType";
   value: TLBFieldType;
@@ -137,11 +138,16 @@ export type TLBExoticType = {
   kind: "TLBExoticType";
 };
 
+export type TLBBoolType = {
+  kind: "TLBBoolType";
+  value: boolean | undefined;
+}
+
 export type TLBFieldType =
   | TLBNumberType
+  | TLBBoolType
   | TLBBitsType
   | TLBNamedType
-  | TLBBoolType
   | TLBCoinsType
   | TLBAddressType
   | TLBHashmapType
@@ -151,6 +157,7 @@ export type TLBFieldType =
   | TLBNegatedType
   | TLBCellInsideType
   | TLBMultipleType
+  | TLBTupleType
   | TLBCondType
   | TLBExoticType;
 

src/astbuilder/fill_constructors.ts

@@ -434,6 +434,8 @@ function checkAndRemovePrimitives(
   typesToDelete.set("VarInteger", ["d466ed5"])
   typesToDelete.set("HashmapE", ["32bae5cb", "28fa3979"])
   typesToDelete.set("HashmapAugE", ["36820dce", "5f71ac75"])
+  typesToDelete.set("BoolTrue", ["943ebb5"])
+  typesToDelete.set("BoolFalse", ["1f5e497d"])
 
   typesToDelete.forEach((opCodesExpected: string[], typeName: string) => {
     let typeItems = typeDeclarations.get(typeName);

src/astbuilder/handle_field.ts

@@ -25,7 +25,7 @@ function getField(
     let result: TLBField = {
       name: "",
       anonymous: true,
-      fieldType: { kind: "TLBBoolType" },
+      fieldType: { kind: "TLBNamedType", name: "Bool", arguments: [] },
       subFields: [],
     };
     let currentFieldIndex = 0;
@@ -80,7 +80,7 @@ function getField(
           let result: TLBField = {
             name: fieldName,
             anonymous: true,
-            fieldType: { kind: "TLBBoolType" },
+            fieldType: { kind: "TLBNamedType", name: "Bool", arguments: [] },
             subFields: [subField],
           };
           return result;

src/astbuilder/handle_type.ts

@@ -170,7 +170,7 @@ export function getType(
       if (key.kind != 'TLBExprMathType') {
         throw new Error('Hashmap key should be number')
       }
-      return { kind: "TLBHashmapType", key: key, value: value };
+      return { kind: "TLBHashmapType", key: key, value: value, directStore: false };
     } else if (expr.name == "HashmapAugE") {
       if (expr.args.length != 3) {
         throw new Error('Not enough arguments for HashmapAugE')
@@ -181,7 +181,14 @@ export function getType(
       if (key.kind != 'TLBExprMathType') {
         throw new Error('Hashmap key should be number')
       }
-      return { kind: "TLBHashmapType", key: key, value: value, extra: extra };
+      return { kind: "TLBHashmapType", key: key, value: value, extra: extra, directStore: false };
+    } else if (expr.name == "Hashmap" && constructor.tlbType != "HashmapNode") {
+      let key = getType(expr.args[0], constructor, fieldTypeName)
+      let value = getType(expr.args[1], constructor, fieldTypeName)
+      if (key.kind != 'TLBExprMathType') {
+        throw new Error('Hashmap key should be number')
+      }
+      return { kind: "TLBHashmapType", key: key, value: value, directStore: true };
     } else if (
       expr.name == "VarUInteger" &&
       (expr.args[0] instanceof MathExpr ||
@@ -229,6 +236,10 @@ export function getType(
         signed: true,
         maxBits: 257,
       };
+    } else if (expr.name == "VmStack") {
+      return {
+        kind: "TLBTupleType",
+      }
     } else if (expr.name == "Bits") {
       return { kind: "TLBBitsType", bits: new TLBNumberExpr(1023) };
     } else if (expr.name == "Bit") {
@@ -261,8 +272,6 @@ export function getType(
       };
     } else if ((theNum = splitForTypeValue(expr.name, "bits")) != undefined) {
       return { kind: "TLBBitsType", bits: new TLBNumberExpr(theNum) };
-    } else if (expr.name == "Bool") {
-      return { kind: "TLBBoolType" };
     } else if (expr.name == "MsgAddressInt") {
       return { kind: "TLBAddressType", addrType: "Internal" };
     } else if (expr.name == "MsgAddressExt") {
@@ -271,8 +280,14 @@ export function getType(
       return { kind: "TLBAddressType", addrType: "Any" };
     } else if (expr.name == "Bit") {
       return { kind: "TLBBitsType", bits: new TLBNumberExpr(1) };
-    } else if (expr.name == "Grams") {
+    } else if (expr.name == "Grams" || expr.name == "Coins") {
       return { kind: "TLBCoinsType" };
+    } else if (expr.name == "Bool") {
+      return { kind: "TLBBoolType", value: undefined };
+    } else if (expr.name == "BoolFalse") {
+      return { kind: "TLBBoolType", value: false };
+    } else if (expr.name == "BoolTrue") {
+      return { kind: "TLBBoolType", value: true };
     } else {
       if (constructor.variablesMap.get(expr.name)?.type == "#") {
         return {

src/generators/generator.ts

@@ -9,7 +9,7 @@ export interface CodeGenerator {
     tlbCode: TLBCode
 
     addTonCoreClassUsage(name: string): void
-    addBitLenFunction(): void
+    addBuiltinCode(): void
     addTlbType(tlbType: TLBType): void
     toCode(node: TheNode, code: CodeBuilder): CodeBuilder
 }

src/generators/typescript/complex_expr.ts

@@ -1,7 +1,7 @@
 import { TLBCode, TLBConstructorTag, TLBField, TLBHashmapType, TLBMathExprType } from "../../ast";
 import { findNotReservedName, firstLower, getCurrentSlice } from "../../utils";
 import { ConstructorContext } from "./generator";
-import { BinaryExpression, Expression, GenDeclaration, Identifier, ObjectExpression, Statement, TypeExpression, TypeParametersExpression, TypedIdentifier, id, tArrowFunctionExpression, tArrowFunctionType, tBinaryExpression, tDeclareVariable, tExpressionStatement, tForCycle, tFunctionCall, tFunctionDeclaration, tIfStatement, tMemberExpression, tMultiStatement, tNumericLiteral, tObjectExpression, tObjectProperty, tReturnStatement, tStringLiteral, tStructExpression, tTypeParametersExpression, tTypeWithParameters, tTypedIdentifier, tUnaryOpExpression, toCode } from "./tsgen";
+import { BinaryExpression, Expression, GenDeclaration, Identifier, ObjectExpression, Statement, TypeExpression, TypeParametersExpression, TypedIdentifier, id, tArrowFunctionExpression, tArrowFunctionType, tBinaryExpression, tDeclareVariable, tExpressionStatement, tForCycle, tFunctionCall, tFunctionDeclaration, tIdentifier, tIfStatement, tMemberExpression, tMultiStatement, tNumericLiteral, tObjectExpression, tObjectProperty, tReturnStatement, tStringLiteral, tStructDeclaration, tStructExpression, tTypeParametersExpression, tTypeWithParameters, tTypedIdentifier, tUnaryOpExpression, toCode } from "./tsgen";
 import { ExprForParam, convertToAST, getNegationDerivationFunctionBody, isBigIntExpr } from "./utils";
 
 export function tEqualExpression(left: Expression, right: Expression) {
@@ -40,6 +40,7 @@ export function bitlenFunctionDecl(): GenDeclaration {
         [tExpressionStatement(id("return n.toString(2).length"))]
     );
 }
+
 export function typedSlice() {
     return [tTypedIdentifier(id("slice"), id("Slice"))];
 }
@@ -331,8 +332,8 @@ export function negationDerivationFuncDecl(
     )
   );
 }
-export function dictStoreStmt(currentCell: string, storeParametersInside: Expression[], keyForStore: Expression, valueStore: ObjectExpression): Statement | undefined {
-  return tExpressionStatement(tFunctionCall(tMemberExpression(id(currentCell), id('storeDict')), storeParametersInside.concat([keyForStore, valueStore])));
+export function dictStoreStmt(currentCell: string, storeParametersInside: Expression[], keyForStore: Expression, valueStore: ObjectExpression, direct: boolean): Statement | undefined {
+  return tExpressionStatement(tFunctionCall(tMemberExpression(id(currentCell), id('storeDict' + (direct ? 'Direct' : ''))), storeParametersInside.concat([keyForStore, valueStore])));
 }
 export function dictTypeParamExpr(fieldType: TLBHashmapType, typeParamExpr: TypeExpression): TypeExpression | undefined {
   return tTypeWithParameters(id('Dictionary'), tTypeParametersExpression([(isBigIntExpr(fieldType.key) ? id('bigint') : id('number')), typeParamExpr]));
@@ -351,8 +352,8 @@ export function dictValueStore(typeParamExpr: TypeExpression, storeFunctionExpr:
     )
   ]);
 }
-export function dictLoadExpr(keyForLoad: Expression, loadFunctionExpr: Expression, currentSlice: string): Expression | undefined {
-  return tFunctionCall(tMemberExpression(id('Dictionary'), id('load')), [keyForLoad, dictValueLoad(loadFunctionExpr), id(currentSlice)]);
+export function dictLoadExpr(keyForLoad: Expression, loadFunctionExpr: Expression, currentSlice: string, direct: boolean): Expression | undefined {
+  return tFunctionCall(tMemberExpression(id('Dictionary'), id('load' + (direct ? 'Direct' : ''))), [keyForLoad, dictValueLoad(loadFunctionExpr), id(currentSlice)]);
 }
 function dictValueLoad(loadFunctionExpr: Expression) {
   return tObjectExpression([