@abaplint/transpiler 2.10.10 → 2.10.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/build/src/expressions/field_chain.js +1 -1
  2. package/build/src/expressions/target.js +1 -1
  3. package/build/src/keywords.d.ts +1 -1
  4. package/build/src/keywords.js +6 -3
  5. package/build/src/statements/data.js +2 -1
  6. package/build/src/statements/form.js +4 -3
  7. package/build/src/statements/method_implementation.js +14 -13
  8. package/build/src/traversal.d.ts +1 -0
  9. package/build/src/traversal.js +8 -0
  10. package/build/src/validation.js +1 -1
  11. package/package.json +2 -2
package/build/src/expressions/field_chain.js CHANGED
@@ -18,7 +18,7 @@ class FieldChainTranspiler {
18
18
  if (c.get() instanceof core_1.Expressions.SourceField
19
19
  || c.get() instanceof core_1.Expressions.Field) {
20
20
  const name = traversal.prefixAndName(c.getFirstToken(), filename).replace("~", "$");
21
- ret.append(traversal_1.Traversal.escapeNamespace(name), c, traversal);
21
+ ret.append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(name)), c, traversal);
22
22
  }
23
23
  else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.SourceFieldSymbol) {
24
24
  ret.appendChunk(new field_symbol_1.FieldSymbolTranspiler().transpile(c, traversal));
package/build/src/expressions/target.js CHANGED
@@ -15,7 +15,7 @@ class TargetTranspiler {
15
15
  const next = children[i + 1];
16
16
  if (c.get() instanceof core_1.Expressions.TargetField) {
17
17
  const prefix = traversal.prefixAndName(c.getFirstToken()).replace("~", "$");
18
- ret.append(traversal_1.Traversal.escapeNamespace(prefix), c, traversal);
18
+ ret.append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(prefix)), c, traversal);
19
19
  }
20
20
  else if (c.get() instanceof core_1.Expressions.ClassName) {
21
21
  const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
package/build/src/keywords.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as abaplint from "@abaplint/core";
2
- export declare const defaultKeywords: string[];
2
+ export declare const DEFAULT_KEYWORDS: string[];
3
3
  /** Replaces javascript keywords in ABAP source code, in-memory only */
4
4
  export declare class Keywords {
5
5
  private readonly keywords;
package/build/src/keywords.js CHANGED
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Keywords = exports.defaultKeywords = void 0;
3
+ exports.Keywords = exports.DEFAULT_KEYWORDS = void 0;
4
4
  const abaplint = require("@abaplint/core");
5
5
  // https://www.w3schools.com/js/js_reserved.asp
6
- exports.defaultKeywords = [
6
+ exports.DEFAULT_KEYWORDS = [
7
7
  "abstract", "arguments", "await",
8
8
  "break", "byte", "catch",
9
9
  "char", "class", "const", "continue",
@@ -31,10 +31,13 @@ class Keywords {
31
31
  this.keywords = keywords;
32
32
  }
33
33
  else {
34
- this.keywords = exports.defaultKeywords;
34
+ this.keywords = exports.DEFAULT_KEYWORDS;
35
35
  }
36
36
  }
37
37
  handle(reg) {
38
+ if (this.keywords.length === 0) {
39
+ return;
40
+ }
38
41
  reg.parse();
39
42
  for (const o of reg.getObjects()) {
40
43
  if (!(o instanceof abaplint.ABAPObject)) {
package/build/src/statements/data.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DataTranspiler = void 0;
4
4
  const abaplint = require("@abaplint/core");
5
5
  const transpile_types_1 = require("../transpile_types");
6
+ const traversal_1 = require("../traversal");
6
7
  const constant_1 = require("../expressions/constant");
7
8
  const expressions_1 = require("../expressions");
8
9
  const chunk_1 = require("../chunk");
@@ -29,7 +30,7 @@ class DataTranspiler {
29
30
  }
30
31
  const ret = new chunk_1.Chunk()
31
32
  .appendString("let ")
32
- .append(found.getName().toLowerCase(), token, traversal)
33
+ .append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(found.getName().toLowerCase())), token, traversal)
33
34
  .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
34
35
  .append(";", node.getLastToken(), traversal)
35
36
  .append(value, node.getLastToken(), traversal);
package/build/src/statements/form.js CHANGED
@@ -4,6 +4,7 @@ exports.FormTranspiler = void 0;
4
4
  const abaplint = require("@abaplint/core");
5
5
  const chunk_1 = require("../chunk");
6
6
  const unique_identifier_1 = require("../unique_identifier");
7
+ const traversal_1 = require("../traversal");
7
8
  class FormTranspiler {
8
9
  transpile(node, traversal) {
9
10
  unique_identifier_1.UniqueIdentifier.resetIndexBackup();
@@ -13,13 +14,13 @@ class FormTranspiler {
13
14
  const ret = new chunk_1.Chunk("async function " + name + "(INPUT) {");
14
15
  const params = [];
15
16
  for (const p of def?.getChangingParameters() || []) {
16
- params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
17
+ params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
17
18
  }
18
19
  for (const p of def?.getTablesParameters() || []) {
19
- params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
20
+ params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
20
21
  }
21
22
  for (const p of def?.getUsingParameters() || []) {
22
- params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
23
+ params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
23
24
  }
24
25
  if (params.length > 0) {
25
26
  ret.appendString("\n" + params.join("\n"));
package/build/src/statements/method_implementation.js CHANGED
@@ -33,6 +33,7 @@ class MethodImplementationTranspiler {
33
33
  for (const n in vars) {
34
34
  const identifier = vars[n];
35
35
  const varName = n.toLowerCase();
36
+ const varPrefixed = traversal_1.Traversal.prefixVariable(varName);
36
37
  if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
37
38
  || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)
38
39
  || identifier.getMeta().includes("event_parameter" /* abaplint.IdentifierMeta.EventParameter */)
@@ -45,31 +46,31 @@ class MethodImplementationTranspiler {
45
46
  const passByValue = identifier.getMeta().includes("pass_by_value" /* abaplint.IdentifierMeta.PassByValue */);
46
47
  const type = identifier.getType();
47
48
  if (identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
48
- after += `let ${varName} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
49
+ after += `let ${varPrefixed} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
49
50
  }
50
51
  else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
51
52
  && parameterDefault === undefined
52
53
  && passByValue === false
53
54
  && isOptional === false
54
55
  && type.isGeneric() === false) {
55
- after += `let ${varName} = ${unique}?.${varName};\n`;
56
+ after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
56
57
  if (identifier.getType().getQualifiedName() !== undefined && identifier.getType().getQualifiedName() !== "") {
57
- after += `if (${varName}?.getQualifiedName === undefined || ${varName}.getQualifiedName() !== "${identifier.getType().getQualifiedName()?.toUpperCase()}") { ${varName} = undefined; }\n`;
58
+ after += `if (${varPrefixed}?.getQualifiedName === undefined || ${varPrefixed}.getQualifiedName() !== "${identifier.getType().getQualifiedName()?.toUpperCase()}") { ${varPrefixed} = undefined; }\n`;
58
59
  }
59
- after += `if (${varName} === undefined) { ${varName} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())}.set(${unique}.${varName}); }\n`;
60
+ after += `if (${varPrefixed} === undefined) { ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())}.set(${unique}.${varName}); }\n`;
60
61
  }
61
62
  else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
62
63
  && type.isGeneric() === true) {
63
64
  if (isOptional === true) {
64
- after += `let ${varName} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
65
+ after += `let ${varPrefixed} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
65
66
  }
66
67
  else {
67
- after += `let ${varName} = ${unique}?.${varName};\n`;
68
+ after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
68
69
  }
69
70
  if (type instanceof abaplint.BasicTypes.NumericGenericType) {
70
- after += `if (${varName}.constructor.name === "Character") {
71
- ${varName} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
72
- ${varName}.set(${unique}?.${varName});
71
+ after += `if (${varPrefixed}.constructor.name === "Character") {
72
+ ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
73
+ ${varPrefixed}.set(${unique}?.${varName});
73
74
  }\n`;
74
75
  }
75
76
  }
@@ -77,19 +78,19 @@ class MethodImplementationTranspiler {
77
78
  && type.isGeneric() === false) {
78
79
  after += new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
79
80
  // note: it might be nessesary to do a type conversion, eg char is passed to xstring parameter
80
- after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
81
+ after += "if (" + unique + " && " + unique + "." + varName + ") {" + varPrefixed + ".set(" + unique + "." + varName + ");}\n";
81
82
  }
82
83
  else {
83
84
  after += new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
84
- after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + " = " + unique + "." + varName + ";}\n";
85
+ after += "if (" + unique + " && " + unique + "." + varName + ") {" + varPrefixed + " = " + unique + "." + varName + ";}\n";
85
86
  }
86
87
  if (parameterDefault) {
87
88
  const val = this.buildDefault(parameterDefault, traversal, methodDef?.getFilename());
88
89
  if (passByValue === true || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)) {
89
- after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + ".set(" + val + ");}\n";
90
+ after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varPrefixed + ".set(" + val + ");}\n";
90
91
  }
91
92
  else {
92
- after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + " = " + val + ";}\n";
93
+ after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varPrefixed + " = " + val + ";}\n";
93
94
  }
94
95
  }
95
96
  }
package/build/src/traversal.d.ts CHANGED
@@ -10,6 +10,7 @@ export declare class Traversal {
10
10
  readonly options: ITranspilerOptions | undefined;
11
11
  constructor(spaghetti: abaplint.ISpaghettiScope, file: abaplint.ABAPFile, obj: abaplint.ABAPObject, reg: abaplint.IRegistry, options?: ITranspilerOptions);
12
12
  static escapeNamespace(name: string | undefined): string | undefined;
13
+ static prefixVariable(name: string | undefined): string;
13
14
  getCurrentObject(): abaplint.ABAPObject;
14
15
  traverse(node: abaplint.INode | undefined): Chunk;
15
16
  getFilename(): string;
package/build/src/traversal.js CHANGED
@@ -8,6 +8,7 @@ const StructureTranspilers = require("./structures");
8
8
  const transpile_types_1 = require("./transpile_types");
9
9
  const chunk_1 = require("./chunk");
10
10
  const expressions_1 = require("./expressions");
11
+ const keywords_1 = require("./keywords");
11
12
  class Traversal {
12
13
  constructor(spaghetti, file, obj, reg, options) {
13
14
  this.scopeCache = undefined;
@@ -20,6 +21,13 @@ class Traversal {
20
21
  static escapeNamespace(name) {
21
22
  return name?.replace(/\//g, "$");
22
23
  }
24
+ static prefixVariable(name) {
25
+ // TODO: performace, make this a hash lookup?,
26
+ if (keywords_1.DEFAULT_KEYWORDS.some(k => k === name)) {
27
+ return "$" + name;
28
+ }
29
+ return name + "";
30
+ }
23
31
  getCurrentObject() {
24
32
  return this.obj;
25
33
  }
package/build/src/validation.js CHANGED
@@ -120,7 +120,7 @@ class Validation {
120
120
  }
121
121
  exports.config.rules["forbidden_identifier"]["check"] = ["^unique\\d+$"];
122
122
  if (this.options?.keywords === undefined) {
123
- for (const d of keywords_1.defaultKeywords) {
123
+ for (const d of keywords_1.DEFAULT_KEYWORDS) {
124
124
  const add = "^" + d + "$";
125
125
  exports.config.rules["forbidden_identifier"]["check"].push(add);
126
126
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abaplint/transpiler",
3
- "version": "2.10.10",
3
+ "version": "2.10.12",
4
4
  "description": "Transpiler",
5
5
  "main": "build/src/index.js",
6
6
  "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
29
29
  "author": "abaplint",
30
30
  "license": "MIT",
31
31
  "dependencies": {
32
- "@abaplint/core": "^2.112.22",
32
+ "@abaplint/core": "^2.113.6",
33
33
  "source-map": "^0.7.4"
34
34
  },
35
35
  "devDependencies": {