@grey-ts/transpiler 1.4.0 → 1.4.1

package/dist/index.js

@@ -746,7 +746,7 @@ NodeHandler.register(ts7.SyntaxKind.BinaryExpression, (node) => {
   }
   switch (operatorToken) {
     case "instanceof":
-      return callUtilFunction("instance_of", left, right);
+      return `${left} isa ${right}`;
     case "??":
       return callUtilFunction("nullish_coalescing_op", left, right);
     case "??=":
@@ -1059,6 +1059,29 @@ NodeHandler.register(ts10.SyntaxKind.ImportDeclaration, (node, ctx) => {
 
 // src/visitors/objects.ts
 import ts11 from "typescript";
+function shouldGetSafely(node) {
+  if (ts11.isNonNullExpression(node.parent))
+    return false;
+  if (valueIsBeingAssignedToNode(node))
+    return false;
+  const hasQuestionDot = !!node.questionDotToken;
+  if (ts11.isPropertyAccessExpression(node)) {
+    const rightType = checker.getTypeAtLocation(node.name);
+    if (!rightType.isUnion())
+      return hasQuestionDot;
+    const hasUndefined = rightType.types.some((t) => t.flags === ts11.TypeFlags.Undefined);
+    if (!hasUndefined)
+      return false;
+    if (!ts11.isCallExpression(node.parent))
+      return true;
+    if (node.parent.arguments.length)
+      return false;
+  } else {
+    if (ts11.isNumericLiteral(node.argumentExpression))
+      return false;
+  }
+  return hasQuestionDot;
+}
 NodeHandler.register(ts11.SyntaxKind.PropertyAccessExpression, (node, ctx) => {
   const left = NodeHandler.handle(node.expression);
   let right = NodeHandler.handle(node.name);
@@ -1066,14 +1089,7 @@ NodeHandler.register(ts11.SyntaxKind.PropertyAccessExpression, (node, ctx) => {
   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)
+  if (shouldGetSafely(node))
     return callUtilFunction("get_property", left, `"${right}"`);
   let output = `${left}.${right}`;
   output = replacePropertyAccess(output, nodeSymbol);
@@ -1090,7 +1106,7 @@ NodeHandler.register(ts11.SyntaxKind.ElementAccessExpression, (node, ctx) => {
   } else {
     right = NodeHandler.handle(node.argumentExpression);
   }
-  if (!valueIsBeingAssignedToNode(node) && !ts11.isNumericLiteral(node.argumentExpression)) {
+  if (shouldGetSafely(node)) {
     return callUtilFunction("get_property", left, `${right}`);
   }
   return `${left}[${right}]`;
@@ -1724,18 +1740,6 @@ var utilFunctions = {
     "\treturn target",
     "end function"
   ].join(`
-`),
-  instance_of: [
-    "instance_of = function(obj, class)",
-    '\tif not obj.hasIndex("__isa") then return 0',
-    "\tisaobj = obj",
-    '\twhile isaobj.hasIndex("__isa")',
-    '\t\tif isaobj["__isa"] == class then return 1',
-    '\t\tisaobj = isaobj["__isa"]',
-    "\tend while",
-    "\treturn 0",
-    "end function"
-  ].join(`
 `),
   nullish_coalescing_op: `nullish_coalescing_op = function(left, right)
 	if left == null then return @right

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@grey-ts/transpiler",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"description": "Transpiles TypeScript into GreyScript",
 	"author": "Okka",
 	"module": "src/index.ts",
@@ -34,12 +34,11 @@
 		"build": "bun run scripts/build.ts"
 	},
 	"devDependencies": {
-		"@types/bun": "latest"
+		"@types/bun": "latest",
+		"@grey-ts/types": "latest"
 	},
 	"peerDependencies": {
-		"typescript": "^5"
-	},
-	"dependencies": {
+		"typescript": "^5",
 		"@grey-ts/types": "^2.2.0"
 	}
 }