@grey-ts/transpiler 1.1.2 → 1.2.0

package/dist/index.js

@@ -44,6 +44,7 @@ class NodeHandler {
 }
 NodeHandler.register(ts.SyntaxKind.TypeAliasDeclaration, () => "");
 NodeHandler.register(ts.SyntaxKind.InterfaceDeclaration, () => "");
+NodeHandler.register(ts.SyntaxKind.ModuleDeclaration, () => "");
 NodeHandler.register(ts.SyntaxKind.EndOfFileToken, () => "");
 NodeHandler.register(ts.SyntaxKind.EmptyStatement, () => "");
 
@@ -971,13 +972,26 @@ NodeHandler.register(ts8.SyntaxKind.AsExpression, (node) => {
   return NodeHandler.handle(node.expression);
 });
 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);
-  const right = replaceIdentifier(NodeHandler.handle(pnode.name), leftType, pnode.name.text);
-  return `${left}.remove(${right})`;
+  if (ts8.isPropertyAccessExpression(node.expression)) {
+    const pnode = node.expression;
+    const left = NodeHandler.handle(pnode.expression);
+    const leftType = checker.getTypeAtLocation(pnode.expression);
+    const right = replaceIdentifier(NodeHandler.handle(pnode.name), leftType, pnode.name.text);
+    return `${left}.remove("${right}")`;
+  }
+  if (ts8.isElementAccessExpression(node.expression)) {
+    const pnode = node.expression;
+    const left = NodeHandler.handle(pnode.expression);
+    let right;
+    if (ts8.isStringLiteral(pnode.argumentExpression)) {
+      const leftType = checker.getTypeAtLocation(pnode.expression);
+      right = `"${replaceIdentifier(pnode.argumentExpression.text, leftType, pnode.argumentExpression.text)}"`;
+    } else {
+      right = NodeHandler.handle(pnode.argumentExpression);
+    }
+    return `${left}.remove(${right})`;
+  }
+  throw `Cant handle delete expression for ${ts8.SyntaxKind[node.expression.kind]}`;
 });
 
 // src/visitors/functions.ts
@@ -1166,11 +1180,13 @@ NodeHandler.register(ts12.SyntaxKind.ForStatement, (node) => {
     }
     return false;
   }
+  const labelIf = ts12.isLabeledStatement(node.parent) ? `	if ${node.parent.label.text}Broke then break` : "";
   if (!hasContinue(node)) {
     return [
       `${initializer}`,
       `while ${condition}`,
       `	${statement.trimStart()}`,
+      ...labelIf ? [labelIf] : [],
       `	${incrementor}`,
       `end while`
     ].join(`
@@ -1187,6 +1203,7 @@ NodeHandler.register(ts12.SyntaxKind.ForStatement, (node) => {
     `	end if`,
     `	${incrementedStateVarName} = 0`,
     `	${statement.trimStart()}`,
+    ...labelIf ? [labelIf] : [],
     `	${incrementor}`,
     `	${incrementedStateVarName} = 1`,
     `end while`
@@ -1203,9 +1220,14 @@ NodeHandler.register(ts12.SyntaxKind.ForOfStatement, (node) => {
   }
   const varName = NodeHandler.handle(node.initializer.declarations[0].name);
   const objToLoop = NodeHandler.handle(node.expression);
-  return `for ${varName} in ${objToLoop}
-${NodeHandler.handle(node.statement)}
-end for`;
+  const labelIf = ts12.isLabeledStatement(node.parent) ? `	if ${node.parent.label.text}Broke then break` : "";
+  return [
+    `for ${varName} in ${objToLoop}`,
+    `${NodeHandler.handle(node.statement)}`,
+    ...labelIf ? [labelIf] : [],
+    `end for`
+  ].join(`
+`);
 });
 NodeHandler.register(ts12.SyntaxKind.ForInStatement, (node) => {
   if (!ts12.isVariableDeclarationList(node.initializer)) {
@@ -1216,9 +1238,14 @@ NodeHandler.register(ts12.SyntaxKind.ForInStatement, (node) => {
   }
   const varName = NodeHandler.handle(node.initializer.declarations[0].name);
   const objToLoop = NodeHandler.handle(node.expression);
-  return `for ${varName} in ${objToLoop}.indexes
-${NodeHandler.handle(node.statement)}
-end for`;
+  const labelIf = ts12.isLabeledStatement(node.parent) ? `	if ${node.parent.label.text}Broke then break` : "";
+  return [
+    `for ${varName} in ${objToLoop}.indexes`,
+    `${NodeHandler.handle(node.statement)}`,
+    ...labelIf ? [labelIf] : [],
+    `end for`
+  ].join(`
+`);
 });
 NodeHandler.register(ts12.SyntaxKind.IfStatement, (node) => {
   const condition = NodeHandler.handle(node.expression);
@@ -1248,20 +1275,24 @@ end if`;
 });
 NodeHandler.register(ts12.SyntaxKind.WhileStatement, (node, ctx) => {
   const expression = NodeHandler.handle(node.expression);
+  const labelIf = ts12.isLabeledStatement(node.parent) ? `	if ${node.parent.label.text}Broke then break` : "";
   return [
     `while ${expression}`,
     `	${NodeHandler.handle(node.statement).trimStart()}`,
+    ...labelIf ? [labelIf] : [],
     `end while`
   ].join(`
 `);
 });
 NodeHandler.register(ts12.SyntaxKind.DoStatement, (node, ctx) => {
   const expression = NodeHandler.handle(node.expression);
+  const labelIf = ts12.isLabeledStatement(node.parent) ? `	if ${node.parent.label.text}Broke then break` : "";
   return [
     `did_once = 0`,
     `while not did_once or ${expression}`,
     `	did_once = 1`,
     `	${NodeHandler.handle(node.statement).trimStart()}`,
+    ...labelIf ? [labelIf] : [],
     `end while`
   ].join(`
 `);
@@ -1270,6 +1301,12 @@ NodeHandler.register(ts12.SyntaxKind.ContinueStatement, (node) => {
   return "continue";
 });
 NodeHandler.register(ts12.SyntaxKind.BreakStatement, (node) => {
+  if (node.label) {
+    if (!ts12.isBlock(node.parent))
+      throw "A break statement with a label must be in a block";
+    return `${NodeHandler.handle(node.label)}Broke = 1
+break`;
+  }
   return "break";
 });
 NodeHandler.register(ts12.SyntaxKind.ReturnStatement, (node) => {
@@ -1281,6 +1318,10 @@ NodeHandler.register(ts12.SyntaxKind.ReturnStatement, (node) => {
   }
   return `return ${NodeHandler.handle(node.expression)}`;
 });
+NodeHandler.register(ts12.SyntaxKind.LabeledStatement, (node) => {
+  return `${NodeHandler.handle(node.label)}Broke = 0
+${NodeHandler.handle(node.statement)}`;
+});
 
 // src/visitors/variables.ts
 import ts13 from "typescript";
@@ -1309,16 +1350,27 @@ NodeHandler.register(ts13.SyntaxKind.VariableStatement, (node, ctx) => {
 NodeHandler.register(ts13.SyntaxKind.VariableDeclaration, handleVariableDeclaration);
 NodeHandler.register(ts13.SyntaxKind.PropertyDeclaration, handleVariableDeclaration);
 NodeHandler.register(ts13.SyntaxKind.EnumDeclaration, (node) => {
-  const members = node.members.map((member, index) => {
-    const name = NodeHandler.handle(member.name);
+  const members = [];
+  function addMember(name, initializer) {
+    members.push(`${name}: ${initializer}`);
+    if (isNaN(+initializer))
+      return;
+    members.push(`${initializer}: ${name}`);
+  }
+  node.members.forEach((member, index) => {
+    let name = NodeHandler.handle(member.name);
+    if (!ts13.isStringLiteral(member.name))
+      name = `"${name}"`;
     if (member.initializer) {
-      return `${name}: ${NodeHandler.handle(member.initializer)}`;
+      addMember(name, NodeHandler.handle(member.initializer));
+      return;
     }
     const type = checker.getTypeAtLocation(member);
     if ("value" in type) {
-      return `${name}: ${type.value}`;
+      addMember(name, String(type.value));
+      return;
     }
-    return `${name}: ${index}`;
+    addMember(name, index.toString());
   });
   return `${node.name.text} = { ${members.join(", ")} }`;
 });

package/package.json

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