@abaplint/core 2.91.38 → 2.91.39

package/build/abaplint.d.ts

@@ -3222,6 +3222,7 @@ export declare interface IRegistry {
     parseAsync(input?: IRunInput): Promise<IRegistry>;
     addDependencies(files: readonly IFile[]): IRegistry;
     addDependency(file: IFile): IRegistry;
+    removeDependency(obj: IObject): void;
     isDependency(obj: IObject): boolean;
     isFileDependency(filename: string): boolean;
     findIssues(input?: IRunInput): readonly Issue[];
@@ -4465,7 +4466,6 @@ declare class RefreshControl implements IStatement {
 export declare class Registry implements IRegistry {
     private readonly objects;
     private readonly objectsByType;
-    /** object containing filenames of dependencies */
     private readonly dependencies;
     private readonly references;
     private conf;
@@ -4486,9 +4486,11 @@ export declare class Registry implements IRegistry {
     addFile(file: IFile): IRegistry;
     updateFile(file: IFile): IRegistry;
     removeFile(file: IFile): IRegistry;
+    private _addFiles;
     addFiles(files: readonly IFile[]): IRegistry;
     addDependencies(files: readonly IFile[]): IRegistry;
     addDependency(file: IFile): IRegistry;
+    removeDependency(obj: IObject): void;
     isDependency(obj: IObject): boolean;
     isFileDependency(filename: string): boolean;
     findObjectForFile(file: IFile): IObject | undefined;

package/build/src/abap/2_statements/expressions/sql_target.js

@@ -7,7 +7,8 @@ const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 class SQLTarget extends combi_1.Expression {
     getRunnable() {
-        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.tok)(tokens_1.At)), _1.Target));
+        const n = (0, combi_1.ver)(version_1.Version.v754, "NEW");
+        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.opt)(n), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.tok)(tokens_1.At)), _1.Target));
         return (0, combi_1.altPrio)(at, _1.Target);
     }
 }

package/build/src/registry.js

@@ -60,7 +60,6 @@ class Registry {
     constructor(conf) {
         this.objects = {};
         this.objectsByType = {};
-        /** object containing filenames of dependencies */
         this.dependencies = {};
         this.issues = [];
         this.conf = conf ? conf : config_1.Config.getDefault();
@@ -68,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.91.38";
+        return "2.91.39";
     }
     getDDICReferences() {
         return this.references;
@@ -143,6 +142,7 @@ class Registry {
         return this;
     }
     inErrorNamespace(name) {
+        // todo: performance? cache regexp?
         const reg = new RegExp(this.getConfig().getSyntaxSetttings().errorNamespace, "i");
         return reg.test(name);
     }
@@ -163,7 +163,7 @@ class Registry {
         }
         return this;
     }
-    addFiles(files) {
+    _addFiles(files, dependency) {
         var _a;
         const globalExclude = ((_a = this.conf.getGlobal().exclude) !== null && _a !== void 0 ? _a : [])
             .map(pattern => new RegExp(pattern, "i"));
@@ -173,28 +173,60 @@ class Registry {
             if (isNotAbapgitFile || excludeHelper_1.ExcludeHelper.isExcluded(filename, globalExclude)) {
                 continue;
             }
-            const found = this.findOrCreate(f.getObjectName(), f.getObjectType());
+            let found = this.findOrCreate(f.getObjectName(), f.getObjectType());
+            if (dependency === false && found && this.isDependency(found)) {
+                this.removeDependency(found);
+                found = this.findOrCreate(f.getObjectName(), f.getObjectType());
+            }
             found.addFile(f);
         }
         return this;
     }
+    addFiles(files) {
+        this._addFiles(files, false);
+        return this;
+    }
     addDependencies(files) {
         for (const f of files) {
-            this.dependencies[f.getFilename().toUpperCase()] = true;
+            this.addDependency(f);
         }
-        return this.addFiles(files);
+        return this;
     }
     addDependency(file) {
-        this.dependencies[file.getFilename().toUpperCase()] = true;
-        this.addFile(file);
+        var _a;
+        const type = (_a = file.getObjectType()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+        if (type === undefined) {
+            return this;
+        }
+        const name = file.getObjectName().toUpperCase();
+        if (this.dependencies[type] === undefined) {
+            this.dependencies[type] = {};
+        }
+        this.dependencies[type][name] = true;
+        this._addFiles([file], true);
         return this;
     }
+    removeDependency(obj) {
+        var _a;
+        (_a = this.dependencies[obj.getType()]) === null || _a === void 0 ? true : delete _a[obj.getName()];
+        this.removeObject(obj);
+    }
     isDependency(obj) {
-        const filename = obj.getFiles()[0].getFilename().toUpperCase();
-        return this.dependencies[filename] === true;
+        var _a;
+        return ((_a = this.dependencies[obj.getType()]) === null || _a === void 0 ? void 0 : _a[obj.getName()]) === true;
     }
     isFileDependency(filename) {
-        return this.dependencies[filename.toUpperCase()] === true;
+        var _a, _b;
+        const f = this.getFileByName(filename);
+        if (f === undefined) {
+            return false;
+        }
+        const type = (_a = f.getObjectType()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+        if (type === undefined) {
+            return false;
+        }
+        const name = f.getObjectName().toUpperCase();
+        return ((_b = this.dependencies[type]) === null || _b === void 0 ? void 0 : _b[name]) === true;
     }
     // assumption: the file is already in the registry
     findObjectForFile(file) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.38",
+    "version": "2.91.39",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.29.5",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.12",
+        "@types/node": "^18.7.13",
         "chai": "^4.3.6",
         "eslint": "^8.22.0",
         "mocha": "^10.0.0",