@grey-ts/transpiler 1.1.0 → 1.1.1

package/dist/index.js

@@ -486,7 +486,7 @@ end function`;
 });
 
 // src/visitors/expressions.ts
-import ts7 from "typescript";
+import ts8 from "typescript";
 
 // src/call_transformers/callTransformer.ts
 import path2 from "node:path";
@@ -548,12 +548,136 @@ CallTransformer.register("String", (name, args) => {
   return `str(${args[0]})`;
 });
 
+// src/visitors/objects.ts
+import ts7 from "typescript";
+var assignmentOperators = new Set([
+  "=",
+  "??=",
+  "||=",
+  "-=",
+  "+="
+]);
+function valueIsBeingAssignedToNode(node) {
+  const assignAncestor = ts7.findAncestor(node, (ancestor) => {
+    if (ancestor.parent && ts7.isBinaryExpression(ancestor.parent) && ancestor === ancestor.parent.left) {
+      const token = ts7.tokenToString(ancestor.parent.operatorToken.kind) || ancestor.parent.operatorToken.getText();
+      return assignmentOperators.has(token);
+    }
+    return false;
+  });
+  return !!assignAncestor;
+}
+NodeHandler.register(ts7.SyntaxKind.PropertyAccessExpression, (node, ctx) => {
+  const left = NodeHandler.handle(node.expression);
+  let right = NodeHandler.handle(node.name);
+  right = replaceIdentifier(right, checker.getTypeAtLocation(node.expression), right);
+  const nodeSymbol = checker.getSymbolAtLocation(node);
+  if (ctx.namespaceImports[ctx.currentFilePath]?.has(left))
+    return right;
+  let getSafely = !!node.questionDotToken && !ts7.isNonNullExpression(node.parent);
+  const rightType = checker.getTypeAtLocation(node.name);
+  if (rightType.isUnion()) {
+    const hasUndefined = rightType.types.some((t) => t.flags === ts7.TypeFlags.Undefined);
+    if (hasUndefined)
+      getSafely = true;
+  }
+  if (!valueIsBeingAssignedToNode(node) && getSafely)
+    return callUtilFunction("get_property", left, `"${right}"`);
+  let output = `${left}.${right}`;
+  output = replacePropertyAccess(output, nodeSymbol);
+  if (nodeIsFunctionReference(node))
+    output = asRef(output);
+  return output;
+});
+NodeHandler.register(ts7.SyntaxKind.ElementAccessExpression, (node, ctx) => {
+  const left = NodeHandler.handle(node.expression);
+  let right;
+  if (ts7.isStringLiteral(node.argumentExpression)) {
+    const leftType = checker.getTypeAtLocation(node.expression);
+    right = `"${replaceIdentifier(node.argumentExpression.text, leftType, node.argumentExpression.text)}"`;
+  } else {
+    right = NodeHandler.handle(node.argumentExpression);
+  }
+  const asd = ts7.findAncestor(node, (ancestor) => {
+    if (ancestor.parent && ts7.isBinaryExpression(ancestor.parent) && ancestor === ancestor.parent.left) {
+      const token = ts7.tokenToString(ancestor.parent.operatorToken.kind) || ancestor.parent.operatorToken.getText();
+      return assignmentOperators.has(token);
+    }
+    return false;
+  });
+  if (!asd && !ts7.isNumericLiteral(node.argumentExpression)) {
+    return callUtilFunction("get_property", left, `${right}`);
+  }
+  return `${left}[${right}]`;
+});
+function handleObjectLiteralExpression(node, ctx, currObj, outObjects, funcs) {
+  currObj ??= [];
+  outObjects ??= [];
+  funcs ??= [];
+  const objectName = ts7.isVariableDeclaration(node.parent) ? NodeHandler.handle(node.parent.name) : ts7.isBinaryExpression(node.parent) && node === node.parent.right ? NodeHandler.handle(node.parent.left) : "";
+  function pushObj() {
+    if (!currObj?.length)
+      return "";
+    const res = currObj.filter((s) => s != "").join(",");
+    if (res) {
+      outObjects?.push(`{ ${res} }`);
+    }
+    currObj.length = 0;
+    return res;
+  }
+  for (const item of node.properties) {
+    if (ts7.isFunctionLike(item)) {
+      if (!objectName)
+        throw "You can't have method declarations inside an object that is not being assigned to a variable";
+      funcs.push(`${objectName}.${NodeHandler.handle(item)}`);
+      continue;
+    }
+    if (ts7.isPropertyAssignment(item) && ts7.isFunctionLike(item.initializer)) {
+      if (!objectName)
+        throw "You can't have method declarations inside an object that is not being assigned to a variable";
+      funcs.push(`${objectName}.${NodeHandler.handle(item.name)} = ${NodeHandler.handle(item.initializer)}`);
+      continue;
+    }
+    if (ts7.isSpreadAssignment(item)) {
+      if (ts7.isObjectLiteralExpression(item.expression)) {
+        handleObjectLiteralExpression(item.expression, ctx, currObj, outObjects);
+        continue;
+      }
+      if (ts7.isIdentifier(item.expression)) {
+        pushObj();
+        outObjects.push(NodeHandler.handle(item.expression));
+        continue;
+      }
+      if (ts7.isArrayLiteralExpression(item.expression)) {
+        pushObj();
+        outObjects.push(NodeHandler.handle(item.expression));
+        continue;
+      }
+    }
+    currObj.push(NodeHandler.handle(item));
+  }
+  pushObj();
+  if (!outObjects.length)
+    outObjects.push("{}");
+  let output = outObjects[0];
+  if (outObjects.length > 1) {
+    output = callUtilFunction("assign_objects", output, `[${outObjects.slice(1).join(",")}]`);
+  }
+  if (funcs.length) {
+    output += `
+` + funcs.join(`
+`);
+  }
+  return output;
+}
+NodeHandler.register(ts7.SyntaxKind.ObjectLiteralExpression, handleObjectLiteralExpression);
+
 // src/visitors/expressions.ts
 function hasRestParam(params) {
   if (!params.length)
     return false;
   const lastParam = params[params.length - 1];
-  return !!(lastParam.valueDeclaration && ts7.isParameter(lastParam.valueDeclaration) && lastParam.valueDeclaration.dotDotDotToken);
+  return !!(lastParam.valueDeclaration && ts8.isParameter(lastParam.valueDeclaration) && lastParam.valueDeclaration.dotDotDotToken);
 }
 function handleCallArgs(callNode, ctx) {
   const args = callNode.arguments;
@@ -577,11 +701,11 @@ function handleCallArgs(callNode, ctx) {
     }
   }
   for (const arg of args) {
-    if (!ts7.isSpreadElement(arg)) {
+    if (!ts8.isSpreadElement(arg)) {
       pushArgs(false, NodeHandler.handle(arg));
       continue;
     }
-    if (ts7.isArrayLiteralExpression(arg.expression)) {
+    if (ts8.isArrayLiteralExpression(arg.expression)) {
       const arrayItems = [];
       const outArrs = [];
       handleArrayLiteralExpression(arg.expression, ctx, arrayItems, outArrs);
@@ -633,7 +757,7 @@ function handleCallArgs(callNode, ctx) {
     result.push("[]");
   return result;
 }
-NodeHandler.register(ts7.SyntaxKind.CallExpression, (node, ctx) => {
+NodeHandler.register(ts8.SyntaxKind.CallExpression, (node, ctx) => {
   const args = handleCallArgs(node, ctx);
   let name = NodeHandler.handle(node.expression);
   const type = checker.getTypeAtLocation(node.expression);
@@ -652,28 +776,51 @@ NodeHandler.register(ts7.SyntaxKind.CallExpression, (node, ctx) => {
     return name;
   return `${name}(${args.join(", ")})`;
 });
-NodeHandler.register(ts7.SyntaxKind.NewExpression, (node, ctx) => {
+NodeHandler.register(ts8.SyntaxKind.NewExpression, (node, ctx) => {
   const args = handleCallArgs(node, ctx);
   let output = `(new ${NodeHandler.handle(node.expression)}).constructor`;
   if (args.length)
     output += `(${args.join(",")})`;
   return output;
 });
-NodeHandler.register(ts7.SyntaxKind.BinaryExpression, (node) => {
+function shouldHaveOuterPrefix(node, operator) {
+  if (!assignmentOperators.has(operator))
+    return false;
+  if (!ts8.isIdentifier(node.left))
+    return false;
+  const functionAncestor = ts8.findAncestor(node.parent, (n) => ts8.isFunctionLike(n));
+  if (!functionAncestor)
+    return false;
+  if (!ts8.findAncestor(functionAncestor.parent, (n) => ts8.isFunctionLike(n)))
+    return false;
+  const leftSymbol = checker.getSymbolAtLocation(node.left);
+  if (!leftSymbol?.valueDeclaration)
+    return false;
+  return leftSymbol.valueDeclaration.pos < functionAncestor.pos || leftSymbol.valueDeclaration.pos > functionAncestor.end;
+}
+function isAssignmentChain(node, operator) {
+  if (!assignmentOperators.has(operator))
+    return false;
+  if (ts8.isBinaryExpression(node.right) && assignmentOperators.has(ts8.tokenToString(node.right.operatorToken.kind) || ""))
+    return true;
+  if (ts8.hasOnlyExpressionInitializer(node.parent))
+    return true;
+  return false;
+}
+NodeHandler.register(ts8.SyntaxKind.BinaryExpression, (node) => {
   let operatorToken = getOperatorToken(node.operatorToken) || node.operatorToken.getText();
-  if (operatorToken === "=" && ts7.isBinaryExpression(node.right) && node.right.operatorToken.kind === ts7.SyntaxKind.EqualsToken) {
-    throw "Assignment chaining is not supported";
-  }
+  if (isAssignmentChain(node, operatorToken))
+    throw `Assignment chaining is not supported`;
   let right = NodeHandler.handle(node.right);
   if (nodeIsFunctionReference(node.right))
     right = asRef(right);
-  if (ts7.isPropertyAccessExpression(node.left)) {
+  if (ts8.isPropertyAccessExpression(node.left)) {
     const leftType = checker.getTypeAtLocation(node.left.expression);
     const symbol = leftType.getProperty(node.left.name.text);
-    if (symbol?.declarations?.some((decl) => ts7.isSetAccessor(decl))) {
+    if (symbol?.declarations?.some((decl) => ts8.isSetAccessor(decl))) {
       const objName = NodeHandler.handle(node.left.expression);
       const key = node.left.name.text;
-      if (operatorToken !== "=" && symbol.declarations.some((decl) => ts7.isGetAccessor(decl)))
+      if (operatorToken !== "=" && symbol.declarations.some((decl) => ts8.isGetAccessor(decl)))
         throw `Can't handle '${operatorToken}' because '${objName}' doesn't have a getter '${key}'`;
       if (operatorToken === "+=" || operatorToken === "-=") {
         right = `${objName}.${key} ${operatorToken[0]} ${right}`;
@@ -684,14 +831,16 @@ NodeHandler.register(ts7.SyntaxKind.BinaryExpression, (node) => {
     }
   }
   let left = NodeHandler.handle(node.left);
+  if (shouldHaveOuterPrefix(node, operatorToken))
+    left = "outer." + left;
   if (nodeIsFunctionReference(node.left))
     left = asRef(left);
-  if (operatorToken === "or" && (ts7.isVariableDeclaration(node.parent) || ts7.isPropertyAssignment(node.parent))) {
+  if (operatorToken === "or" && ts8.hasOnlyExpressionInitializer(node.parent)) {
     return callUtilFunction("or_op", left, right);
   }
   if (operatorToken === "instanceof") {
     const rightSymbol = checker.getSymbolAtLocation(node.right);
-    const classIdMember = rightSymbol?.members?.get(ts7.escapeLeadingUnderscores("classID"));
+    const classIdMember = rightSymbol?.members?.get(ts8.escapeLeadingUnderscores("classID"));
     if (!classIdMember) {
       throw `Can't handle this 'instanceof' operator because '${right}' doesn't have a 'classID' member, which is needed in GreyScript to check a type`;
     }
@@ -701,43 +850,45 @@ NodeHandler.register(ts7.SyntaxKind.BinaryExpression, (node) => {
     }
     return `${left}.classID == typeof(${right})`;
   }
-  if (operatorToken === "??") {
-    return callUtilFunction("nullish_coalescing_op", left, right);
-  } else if (operatorToken === "??=") {
-    return `${left} = ${callUtilFunction("nullish_coalescing_op", left, right)}`;
-  } else if (operatorToken === "in") {
-    return `${right}.hasIndex(${left})`;
-  } else if (operatorToken === "&") {
-    return `bitwise("&", ${left}, ${right})`;
-  } else if (operatorToken === "|") {
-    return `bitwise("|", ${left}, ${right})`;
-  } else if (operatorToken === "^") {
-    return `bitwise("^", ${left}, ${right})`;
-  } else if (operatorToken === "<<") {
-    return `bitwise("<<", ${left}, ${right})`;
-  } else if (operatorToken === ">>") {
-    return `bitwise(">>", ${left}, ${right})`;
-  } else if (operatorToken === ">>>") {
-    return `bitwise(">>>", ${left}, ${right})`;
+  switch (operatorToken) {
+    case "??":
+      return callUtilFunction("nullish_coalescing_op", left, right);
+    case "??=":
+      return `${left} = ${callUtilFunction("nullish_coalescing_op", left, right)}`;
+    case "in":
+      return `${right}.hasIndex(${left})`;
+    case "&":
+      return `bitwise("&", ${left}, ${right})`;
+    case "|":
+      return `bitwise("|", ${left}, ${right})`;
+    case "^":
+      return `bitwise("^", ${left}, ${right})`;
+    case "<<":
+      return `bitwise("<<", ${left}, ${right})`;
+    case ">>":
+      return `bitwise(">>", ${left}, ${right})`;
+    case ">>>":
+      return `bitwise(">>>", ${left}, ${right})`;
+    case "+=":
+    case "-=":
+      return `${left} = ${left} ${operatorToken[0]} ${right}`;
   }
-  if (operatorToken == "+=" || operatorToken == "-=")
-    return `${left} = ${left} ${operatorToken[0]} ${right}`;
   if (operatorToken === "**")
     operatorToken = "^";
   return `${left} ${operatorToken} ${right}`;
 });
-NodeHandler.register(ts7.SyntaxKind.ParenthesizedExpression, (node) => {
+NodeHandler.register(ts8.SyntaxKind.ParenthesizedExpression, (node) => {
   return `(${NodeHandler.handle(node.expression)})`;
 });
 function handleUnaryExpression(node) {
   const operand = NodeHandler.handle(node.operand);
-  const operator = ts7.tokenToString(node.operator);
+  const operator = ts8.tokenToString(node.operator);
   if (operator === "++")
     return `${operand} = ${operand} + 1`;
   if (operator === "--")
     return `${operand} = ${operand} - 1`;
   if (operator === "!") {
-    if (ts7.isPrefixUnaryExpression(node.parent) && ts7.tokenToString(node.parent.operator) === "!") {
+    if (ts8.isPrefixUnaryExpression(node.parent) && ts8.tokenToString(node.parent.operator) === "!") {
       return `(not ${operand})`;
     }
     return `not ${operand}`;
@@ -750,17 +901,17 @@ function handleUnaryExpression(node) {
     return `bitwise("~", ${operand})`;
   throw `Couldn't handle this UnaryExpression: ${node.getText()}`;
 }
-NodeHandler.register(ts7.SyntaxKind.PrefixUnaryExpression, handleUnaryExpression);
-NodeHandler.register(ts7.SyntaxKind.PostfixUnaryExpression, handleUnaryExpression);
+NodeHandler.register(ts8.SyntaxKind.PrefixUnaryExpression, handleUnaryExpression);
+NodeHandler.register(ts8.SyntaxKind.PostfixUnaryExpression, handleUnaryExpression);
 function handleArrayLiteralExpression(node, ctx, itemStrings, out) {
   itemStrings ??= [];
   out ??= [];
   for (const item of node.elements) {
-    if (!ts7.isSpreadElement(item)) {
+    if (!ts8.isSpreadElement(item)) {
       itemStrings.push(NodeHandler.handle(item));
       continue;
     }
-    if (ts7.isArrayLiteralExpression(item.expression)) {
+    if (ts8.isArrayLiteralExpression(item.expression)) {
       handleArrayLiteralExpression(item.expression, ctx, itemStrings, out);
       continue;
     }
@@ -770,14 +921,14 @@ function handleArrayLiteralExpression(node, ctx, itemStrings, out) {
     }
     out.push(NodeHandler.handle(item.expression));
   }
-  if ((!out.length || itemStrings.length) && !ts7.isSpreadElement(node.parent)) {
+  if ((!out.length || itemStrings.length) && !ts8.isSpreadElement(node.parent)) {
     out.push(`[${itemStrings.join(",")}]`);
     itemStrings.length = 0;
   }
   return out.join(" + ");
 }
-NodeHandler.register(ts7.SyntaxKind.ArrayLiteralExpression, handleArrayLiteralExpression);
-NodeHandler.register(ts7.SyntaxKind.TemplateExpression, (node) => {
+NodeHandler.register(ts8.SyntaxKind.ArrayLiteralExpression, handleArrayLiteralExpression);
+NodeHandler.register(ts8.SyntaxKind.TemplateExpression, (node) => {
   const head = NodeHandler.handle(node.head);
   const strings = [
     ...head ? [`"${head}"`] : [],
@@ -786,22 +937,22 @@ NodeHandler.register(ts7.SyntaxKind.TemplateExpression, (node) => {
   const output = strings.join(" + ");
   return output;
 });
-NodeHandler.register(ts7.SyntaxKind.TemplateHead, (node) => {
+NodeHandler.register(ts8.SyntaxKind.TemplateHead, (node) => {
   return transformString(node.text);
 });
-NodeHandler.register(ts7.SyntaxKind.TemplateSpan, (node) => {
+NodeHandler.register(ts8.SyntaxKind.TemplateSpan, (node) => {
   let output = NodeHandler.handle(node.expression);
-  if (ts7.isBinaryExpression(node.expression))
+  if (ts8.isBinaryExpression(node.expression))
     output = `str(${output})`;
   if (node.literal.text)
     output += ` + "${transformString(node.literal.text)}"`;
   return output;
 });
-NodeHandler.register(ts7.SyntaxKind.NoSubstitutionTemplateLiteral, (node) => {
+NodeHandler.register(ts8.SyntaxKind.NoSubstitutionTemplateLiteral, (node) => {
   return `"${transformString(node.text)}"`;
 });
-NodeHandler.register(ts7.SyntaxKind.ConditionalExpression, (node) => {
-  if (ts7.isCallExpression(node.whenTrue) || ts7.isCallExpression(node.whenFalse)) {
+NodeHandler.register(ts8.SyntaxKind.ConditionalExpression, (node) => {
+  if (ts8.isCallExpression(node.whenTrue) || ts8.isCallExpression(node.whenFalse)) {
     throw "Call expressions are not supported inside conditional expressions yet";
   }
   const condition = NodeHandler.handle(node.condition);
@@ -809,18 +960,18 @@ NodeHandler.register(ts7.SyntaxKind.ConditionalExpression, (node) => {
   const whenFalse = NodeHandler.handle(node.whenFalse);
   return callUtilFunction("conditional_expr", condition, whenTrue, whenFalse);
 });
-NodeHandler.register(ts7.SyntaxKind.ExpressionStatement, (node) => {
+NodeHandler.register(ts8.SyntaxKind.ExpressionStatement, (node) => {
   return NodeHandler.handle(node.expression);
 });
-NodeHandler.register(ts7.SyntaxKind.NonNullExpression, (node) => {
+NodeHandler.register(ts8.SyntaxKind.NonNullExpression, (node) => {
   return NodeHandler.handle(node.expression);
 });
-NodeHandler.register(ts7.SyntaxKind.AsExpression, (node) => {
+NodeHandler.register(ts8.SyntaxKind.AsExpression, (node) => {
   return NodeHandler.handle(node.expression);
 });
-NodeHandler.register(ts7.SyntaxKind.DeleteExpression, (node) => {
-  if (!ts7.isPropertyAccessExpression(node.expression))
-    throw `Cant handle delete expression for ${ts7.SyntaxKind[node.expression.kind]}`;
+NodeHandler.register(ts8.SyntaxKind.DeleteExpression, (node) => {
+  if (!ts8.isPropertyAccessExpression(node.expression))
+    throw `Cant handle delete expression for ${ts8.SyntaxKind[node.expression.kind]}`;
   const pnode = node.expression;
   const left = NodeHandler.handle(pnode.expression);
   const leftType = checker.getTypeAtLocation(pnode.expression);
@@ -829,7 +980,7 @@ NodeHandler.register(ts7.SyntaxKind.DeleteExpression, (node) => {
 });
 
 // src/visitors/functions.ts
-import ts8 from "typescript";
+import ts9 from "typescript";
 function transpileFunctionBody(node) {
   const params = node.parameters.map((param) => NodeHandler.handle(param)).join(", ");
   const body = node.body ? NodeHandler.handle(node.body) : "";
@@ -837,7 +988,7 @@ function transpileFunctionBody(node) {
 ${body}
 end function`;
 }
-NodeHandler.register(ts8.SyntaxKind.Block, (node) => {
+NodeHandler.register(ts9.SyntaxKind.Block, (node) => {
   const output = node.statements.map((val) => {
     let statement = NodeHandler.handle(val);
     statement = statement.split(`
@@ -848,38 +999,38 @@ NodeHandler.register(ts8.SyntaxKind.Block, (node) => {
 `);
   return output;
 });
-NodeHandler.register(ts8.SyntaxKind.MethodDeclaration, (node) => {
+NodeHandler.register(ts9.SyntaxKind.MethodDeclaration, (node) => {
   return `${NodeHandler.handle(node.name)} = ${transpileFunctionBody(node)}`;
 });
-NodeHandler.register(ts8.SyntaxKind.FunctionDeclaration, (node) => {
+NodeHandler.register(ts9.SyntaxKind.FunctionDeclaration, (node) => {
   if (!node.body)
     return "";
-  if (node.modifiers?.some((m) => m.kind === ts8.SyntaxKind.DeclareKeyword))
+  if (node.modifiers?.some((m) => m.kind === ts9.SyntaxKind.DeclareKeyword))
     return "";
   const name = node.name ? node.name.text : "anon";
   return `${name} = ${transpileFunctionBody(node)}`;
 });
-NodeHandler.register(ts8.SyntaxKind.ArrowFunction, (node) => {
+NodeHandler.register(ts9.SyntaxKind.ArrowFunction, (node) => {
   const params = node.parameters.map((param) => NodeHandler.handle(param));
-  const body = ts8.isBlock(node.body) ? NodeHandler.handle(node.body) : `	return ${NodeHandler.handle(node.body)}`;
-  if (ts8.isCallOrNewExpression(node.parent) || ts8.isParenthesizedExpression(node.parent)) {
+  const body = ts9.isBlock(node.body) ? NodeHandler.handle(node.body) : `	return ${NodeHandler.handle(node.body)}`;
+  if (ts9.isCallOrNewExpression(node.parent) || ts9.isParenthesizedExpression(node.parent)) {
     return "@" + createAnonFunction(body, params).name;
   }
-  if (ts8.isPropertyAssignment(node.parent) || ts8.isVariableDeclaration(node.parent) || ts8.isBinaryExpression(node.parent) || ts8.isReturnStatement(node.parent)) {
+  if (ts9.isPropertyAssignment(node.parent) || ts9.isVariableDeclaration(node.parent) || ts9.isBinaryExpression(node.parent) || ts9.isReturnStatement(node.parent)) {
     return `function(${params.join(", ")})
 ${body}
 end function`;
   }
-  const kind = ts8.SyntaxKind[node.parent.kind];
+  const kind = ts9.SyntaxKind[node.parent.kind];
   throw `This kind of arrow function is not yet supported (parent: ${kind} (${node.parent.kind}))`;
 });
-NodeHandler.register(ts8.SyntaxKind.FunctionExpression, (node) => {
+NodeHandler.register(ts9.SyntaxKind.FunctionExpression, (node) => {
   return transpileFunctionBody(node);
 });
 
 // src/visitors/identifiers.ts
-import ts9 from "typescript";
-NodeHandler.register(ts9.SyntaxKind.Identifier, (node, ctx) => {
+import ts10 from "typescript";
+NodeHandler.register(ts10.SyntaxKind.Identifier, (node, ctx) => {
   const type = checker.getTypeAtLocation(node);
   let name = node.text;
   if (name === "undefined")
@@ -897,31 +1048,31 @@ NodeHandler.register(ts9.SyntaxKind.Identifier, (node, ctx) => {
   if (ctx.namedImports[ctx.currentFilePath]?.[name]) {
     name = ctx.namedImports[ctx.currentFilePath][name];
   }
-  if (ts9.isCallOrNewExpression(node.parent) && node != node.parent.expression) {
+  if (ts10.isCallOrNewExpression(node.parent) && node != node.parent.expression) {
     if (nodeIsFunctionReference(node, type))
       name = asRef(name);
   }
   return name;
 });
-NodeHandler.register(ts9.SyntaxKind.Parameter, (node) => {
+NodeHandler.register(ts10.SyntaxKind.Parameter, (node) => {
   const name = NodeHandler.handle(node.name);
   if (!node.initializer)
     return name;
   const initializer = NodeHandler.handle(node.initializer);
   const initializerType = checker.getTypeAtLocation(node.initializer);
-  if (initializerType.flags === ts9.TypeFlags.Object) {
+  if (initializerType.flags === ts10.TypeFlags.Object) {
     throw `You can't initialize parameter '${name}' with an Array or an Object as that won't work in GreyScript and it would be null`;
   }
   return `${name} = ${initializer}`;
 });
-NodeHandler.register(ts9.SyntaxKind.NumericLiteral, (node) => node.text);
-NodeHandler.register(ts9.SyntaxKind.StringLiteral, (node) => `"${transformString(node.text)}"`);
-NodeHandler.register(ts9.SyntaxKind.NullKeyword, () => "null");
-NodeHandler.register(ts9.SyntaxKind.UndefinedKeyword, () => "null");
-NodeHandler.register(ts9.SyntaxKind.FalseKeyword, () => "0");
-NodeHandler.register(ts9.SyntaxKind.TrueKeyword, () => "1");
-NodeHandler.register(ts9.SyntaxKind.ThisKeyword, (node) => {
-  const propDeclarationAncestor = ts9.findAncestor(node.parent, (n) => ts9.isPropertyDeclaration(n));
+NodeHandler.register(ts10.SyntaxKind.NumericLiteral, (node) => node.text);
+NodeHandler.register(ts10.SyntaxKind.StringLiteral, (node) => `"${transformString(node.text)}"`);
+NodeHandler.register(ts10.SyntaxKind.NullKeyword, () => "null");
+NodeHandler.register(ts10.SyntaxKind.UndefinedKeyword, () => "null");
+NodeHandler.register(ts10.SyntaxKind.FalseKeyword, () => "0");
+NodeHandler.register(ts10.SyntaxKind.TrueKeyword, () => "1");
+NodeHandler.register(ts10.SyntaxKind.ThisKeyword, (node) => {
+  const propDeclarationAncestor = ts10.findAncestor(node.parent, (n) => ts10.isPropertyDeclaration(n));
   if (propDeclarationAncestor) {
     if (!propDeclarationAncestor.parent.name)
       throw `Can't handle this 'this' keyword becuase the class doesn't have a name and it's needed for this case`;
@@ -929,12 +1080,12 @@ NodeHandler.register(ts9.SyntaxKind.ThisKeyword, (node) => {
   }
   return "self";
 });
-NodeHandler.register(ts9.SyntaxKind.SuperKeyword, (node) => {
-  if (ts9.isPropertyAccessExpression(node.parent) || ts9.isElementAccessExpression(node.parent))
+NodeHandler.register(ts10.SyntaxKind.SuperKeyword, (node) => {
+  if (ts10.isPropertyAccessExpression(node.parent) || ts10.isElementAccessExpression(node.parent))
     return "super";
   return "super.constructor";
 });
-NodeHandler.register(ts9.SyntaxKind.RegularExpressionLiteral, (node) => {
+NodeHandler.register(ts10.SyntaxKind.RegularExpressionLiteral, (node) => {
   const start = node.text.indexOf("/") + 1;
   const end = node.text.lastIndexOf("/");
   const flags = node.text.slice(end + 1);
@@ -945,7 +1096,7 @@ NodeHandler.register(ts9.SyntaxKind.RegularExpressionLiteral, (node) => {
 
 // src/visitors/imports.ts
 import path3 from "node:path";
-import ts10 from "typescript";
+import ts11 from "typescript";
 function importFile(filePath, ctx, returnResult) {
   let srcPath = path3.resolve(ctx.currentFolder, filePath);
   if (!path3.extname(srcPath))
@@ -957,7 +1108,7 @@ function importFile(filePath, ctx, returnResult) {
   }
   return transpileSourceFile(source, ctx, returnResult);
 }
-NodeHandler.register(ts10.SyntaxKind.ImportDeclaration, (node, ctx) => {
+NodeHandler.register(ts11.SyntaxKind.ImportDeclaration, (node, ctx) => {
   if (!node.importClause) {
     const moduleName = node.moduleSpecifier.text;
     const transpiledFile = importFile(moduleName, ctx, true);
@@ -980,7 +1131,7 @@ NodeHandler.register(ts10.SyntaxKind.ImportDeclaration, (node, ctx) => {
     throw `Can't import default exports yet (imported as ${node.importClause.name.text})`;
   const bindings = node.importClause.namedBindings;
   if (bindings) {
-    if (ts10.isNamespaceImport(bindings)) {
+    if (ts11.isNamespaceImport(bindings)) {
       ctx.namespaceImports[ctx.currentFilePath]?.add(bindings.name.text);
     } else {
       bindings.elements.forEach((el) => {
@@ -994,130 +1145,6 @@ NodeHandler.register(ts10.SyntaxKind.ImportDeclaration, (node, ctx) => {
   return importFile(moduleSpecifier, ctx);
 });
 
-// src/visitors/objects.ts
-import ts11 from "typescript";
-var assignmentOperators = new Set([
-  "=",
-  "??=",
-  "||=",
-  "-=",
-  "+="
-]);
-function valueIsBeingAssignedToNode(node) {
-  const assignAncestor = ts11.findAncestor(node, (ancestor) => {
-    if (ancestor.parent && ts11.isBinaryExpression(ancestor.parent) && ancestor === ancestor.parent.left) {
-      const token = ts11.tokenToString(ancestor.parent.operatorToken.kind) || ancestor.parent.operatorToken.getText();
-      return assignmentOperators.has(token);
-    }
-    return false;
-  });
-  return !!assignAncestor;
-}
-NodeHandler.register(ts11.SyntaxKind.PropertyAccessExpression, (node, ctx) => {
-  const left = NodeHandler.handle(node.expression);
-  let right = NodeHandler.handle(node.name);
-  right = replaceIdentifier(right, checker.getTypeAtLocation(node.expression), right);
-  const nodeSymbol = checker.getSymbolAtLocation(node);
-  if (ctx.namespaceImports[ctx.currentFilePath]?.has(left))
-    return right;
-  let getSafely = !!node.questionDotToken && !ts11.isNonNullExpression(node.parent);
-  const rightType = checker.getTypeAtLocation(node.name);
-  if (rightType.isUnion()) {
-    const hasUndefined = rightType.types.some((t) => t.flags === ts11.TypeFlags.Undefined);
-    if (hasUndefined)
-      getSafely = true;
-  }
-  if (!valueIsBeingAssignedToNode(node) && getSafely)
-    return callUtilFunction("get_property", left, `"${right}"`);
-  let output = `${left}.${right}`;
-  output = replacePropertyAccess(output, nodeSymbol);
-  if (nodeIsFunctionReference(node))
-    output = asRef(output);
-  return output;
-});
-NodeHandler.register(ts11.SyntaxKind.ElementAccessExpression, (node, ctx) => {
-  const left = NodeHandler.handle(node.expression);
-  let right;
-  if (ts11.isStringLiteral(node.argumentExpression)) {
-    const leftType = checker.getTypeAtLocation(node.expression);
-    right = `"${replaceIdentifier(node.argumentExpression.text, leftType, node.argumentExpression.text)}"`;
-  } else {
-    right = NodeHandler.handle(node.argumentExpression);
-  }
-  const asd = ts11.findAncestor(node, (ancestor) => {
-    if (ancestor.parent && ts11.isBinaryExpression(ancestor.parent) && ancestor === ancestor.parent.left) {
-      const token = ts11.tokenToString(ancestor.parent.operatorToken.kind) || ancestor.parent.operatorToken.getText();
-      return assignmentOperators.has(token);
-    }
-    return false;
-  });
-  if (!asd && !ts11.isNumericLiteral(node.argumentExpression)) {
-    return callUtilFunction("get_property", left, `${right}`);
-  }
-  return `${left}[${right}]`;
-});
-function handleObjectLiteralExpression(node, ctx, currObj, outObjects, funcs) {
-  currObj ??= [];
-  outObjects ??= [];
-  funcs ??= [];
-  const objectName = ts11.isVariableDeclaration(node.parent) ? NodeHandler.handle(node.parent.name) : ts11.isBinaryExpression(node.parent) && node === node.parent.right ? NodeHandler.handle(node.parent.left) : "";
-  function pushObj() {
-    if (!currObj?.length)
-      return "";
-    const res = currObj.filter((s) => s != "").join(",");
-    if (res) {
-      outObjects?.push(`{ ${res} }`);
-    }
-    currObj.length = 0;
-    return res;
-  }
-  for (const item of node.properties) {
-    if (ts11.isFunctionLike(item)) {
-      if (!objectName)
-        throw "You can't have method declarations inside an object that is not being assigned to a variable";
-      funcs.push(`${objectName}.${NodeHandler.handle(item)}`);
-      continue;
-    }
-    if (ts11.isPropertyAssignment(item) && ts11.isFunctionLike(item.initializer)) {
-      if (!objectName)
-        throw "You can't have method declarations inside an object that is not being assigned to a variable";
-      funcs.push(`${objectName}.${NodeHandler.handle(item.name)} = ${NodeHandler.handle(item.initializer)}`);
-      continue;
-    }
-    if (ts11.isSpreadAssignment(item)) {
-      if (ts11.isObjectLiteralExpression(item.expression)) {
-        handleObjectLiteralExpression(item.expression, ctx, currObj, outObjects);
-        continue;
-      }
-      if (ts11.isIdentifier(item.expression)) {
-        pushObj();
-        outObjects.push(NodeHandler.handle(item.expression));
-        continue;
-      }
-      if (ts11.isArrayLiteralExpression(item.expression)) {
-        pushObj();
-        outObjects.push(NodeHandler.handle(item.expression));
-        continue;
-      }
-    }
-    currObj.push(NodeHandler.handle(item));
-  }
-  pushObj();
-  if (!outObjects.length)
-    outObjects.push("{}");
-  let output = outObjects[0];
-  if (outObjects.length > 1) {
-    output = callUtilFunction("assign_objects", output, `[${outObjects.slice(1).join(",")}]`);
-  }
-  if (funcs.length) {
-    output += `
-` + funcs.join(`
-`);
-  }
-  return output;
-}
-NodeHandler.register(ts11.SyntaxKind.ObjectLiteralExpression, handleObjectLiteralExpression);
-
 // src/visitors/statements.ts
 import ts12 from "typescript";
 NodeHandler.register(ts12.SyntaxKind.ForStatement, (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@grey-ts/transpiler",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Transpiles TypeScript into GreyScript",
 	"author": "Okka",
 	"module": "src/index.ts",