trm-core 6.2.3 → 6.2.5

package/dist/actions/publish/generateLangTransport.js

@@ -27,7 +27,7 @@ exports.generateLangTransport = {
         logger_1.Logger.log('Generate LANG transport step', true);
         logger_1.Logger.loading(`Generating transports...`);
         logger_1.Logger.loading(`Generating LANG transport...`, true);
-        const aTadir = context.runtime.packageData.tadir.filter(o => !(o.pgmid === 'R3TR' && o.object === 'DEVC'));
+        const aDevc = context.runtime.packageData.tadir.filter(o => o.pgmid === 'R3TR' && o.object === 'DEVC');
         context.runtime.systemData.langTransport = yield transport_1.Transport.createToc({
             trmIdentifier: transport_1.TrmTransportIdentifier.LANG,
             target: context.rawInput.systemData.transportTarget,
@@ -35,7 +35,7 @@ exports.generateLangTransport = {
         });
         var iLanguageObjects = 0;
         try {
-            yield context.runtime.systemData.langTransport.addTranslations(aTadir.map(o => o.objName));
+            yield context.runtime.systemData.langTransport.addTranslations(aDevc.map(o => o.objName));
             iLanguageObjects = (yield context.runtime.systemData.langTransport.getE071()).length;
         }
         catch (e) {

package/dist/trmPackage/TrmArtifact.d.ts

@@ -7,10 +7,13 @@ export declare class TrmArtifact {
     private _distFolder?;
     private _manifest?;
     private _zip;
+    private _binaries;
+    private _content;
     constructor(binary: Buffer, _distFolder?: string, _manifest?: Manifest);
     getManifest(): Manifest | null;
     replaceManifest(oManifest: Manifest): void;
     getDistFolder(): string | null;
     getTransportBinaries(r3transOption?: R3transOptions): Promise<TransportBinary[]>;
+    getContent(r3transConfig?: R3transOptions): Promise<any>;
     static create(transports: Transport[], manifest: Manifest, distFolder?: string): Promise<TrmArtifact>;
 }

package/dist/trmPackage/TrmArtifact.js

@@ -92,37 +92,71 @@ class TrmArtifact {
     getTransportBinaries(r3transOption) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const distFolder = this.getDistFolder();
-            if (!distFolder) {
-                throw new Error(`Couldn't locate dist folder.`);
+            if (!this._binaries) {
+                const distFolder = this.getDistFolder();
+                if (!distFolder) {
+                    throw new Error(`Couldn't locate dist folder.`);
+                }
+                const zipEntries = this._zip.getEntries();
+                const aTransportEntries = zipEntries.filter(o => (new RegExp(`^${distFolder}(/|\\\\)`)).test(o.entryName.trim().toLowerCase()));
+                var aResult = [];
+                const r3trans = new node_r3trans_1.R3trans(r3transOption);
+                for (const entry of aTransportEntries) {
+                    try {
+                        const type = entry.comment;
+                        const oPackedTransport = new AdmZip.default(entry.getData());
+                        const aPackedTransportEntries = oPackedTransport.getEntries();
+                        const oHeader = (_a = aPackedTransportEntries.find(o => o.comment === 'header')) === null || _a === void 0 ? void 0 : _a.getData();
+                        const oData = (_b = aPackedTransportEntries.find(o => o.comment === 'data')) === null || _b === void 0 ? void 0 : _b.getData();
+                        if (oHeader && oData) {
+                            const trkorr = yield r3trans.getTransportTrkorr(oData);
+                            aResult.push({
+                                trkorr,
+                                type: type,
+                                binaries: {
+                                    header: oHeader,
+                                    data: oData
+                                }
+                            });
+                        }
+                    }
+                    catch (e) { }
+                }
+                ;
+                this._binaries = aResult;
             }
-            const zipEntries = this._zip.getEntries();
-            const aTransportEntries = zipEntries.filter(o => (new RegExp(`^${distFolder}(/|\\\\)`)).test(o.entryName.trim().toLowerCase()));
-            var aResult = [];
-            const r3trans = new node_r3trans_1.R3trans(r3transOption);
-            for (const entry of aTransportEntries) {
+            return this._binaries || [];
+        });
+    }
+    getContent(r3transConfig) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._content) {
+                this._content = {};
                 try {
-                    const type = entry.comment;
-                    const oPackedTransport = new AdmZip.default(entry.getData());
-                    const aPackedTransportEntries = oPackedTransport.getEntries();
-                    const oHeader = (_a = aPackedTransportEntries.find(o => o.comment === 'header')) === null || _a === void 0 ? void 0 : _a.getData();
-                    const oData = (_b = aPackedTransportEntries.find(o => o.comment === 'data')) === null || _b === void 0 ? void 0 : _b.getData();
-                    if (oHeader && oData) {
-                        const trkorr = yield r3trans.getTransportTrkorr(oData);
-                        aResult.push({
-                            trkorr,
-                            type,
-                            binaries: {
-                                header: oHeader,
-                                data: oData
+                    const transportBinaries = yield this.getTransportBinaries();
+                    const r3trans = new node_r3trans_1.R3trans(r3transConfig);
+                    for (const transportBinary of transportBinaries) {
+                        const tableEntries = yield r3trans.getTableEntries(transportBinary.binaries.data);
+                        if (!this._content[transportBinary.type]) {
+                            this._content[transportBinary.type] = {
+                                trkorr: transportBinary.trkorr,
+                                content: {}
+                            };
+                        }
+                        Object.keys(tableEntries).forEach(table => {
+                            if (!this._content[transportBinary.type].content[table]) {
+                                this._content[transportBinary.type].content[table] = [];
                             }
+                            this._content[transportBinary.type].content[table] = this._content[transportBinary.type].content[table].concat(tableEntries[table]);
                         });
                     }
                 }
-                catch (e) { }
+                catch (e) {
+                    delete this._content;
+                    throw e;
+                }
             }
-            ;
-            return aResult;
+            return this._content || {};
         });
     }
     static create(transports_1, manifest_2) {

package/dist/trmPackage/TrmPackage.d.ts

@@ -2,6 +2,7 @@ import { Manifest } from "../manifest";
 import { Registry } from "../registry";
 import { TrmArtifact } from "./TrmArtifact";
 import { DEVCLASS } from "../client";
+import { R3transOptions } from "node-r3trans";
 export declare const DEFAULT_VERSION: string;
 export declare class TrmPackage {
     packageName: string;
@@ -10,6 +11,7 @@ export declare class TrmPackage {
     private _userAuthorizations;
     private _canPublishReleasesCause;
     private _remoteArtifacts;
+    private _remoteContent;
     private _devclass;
     constructor(packageName: string, registry: Registry, manifest?: Manifest);
     setDevclass(devclass: DEVCLASS): TrmPackage;
@@ -19,8 +21,9 @@ export declare class TrmPackage {
         canPublishReleases: boolean;
         cause?: string;
     }>;
-    fetchRemoteManifest(version?: string): Promise<Manifest>;
     fetchRemoteArtifact(version?: string): Promise<TrmArtifact>;
+    fetchRemoteManifest(version?: string): Promise<Manifest>;
+    fetchRemoteContent(version?: string, r3transConfig?: R3transOptions): Promise<any>;
     publish(data: {
         artifact: TrmArtifact;
         readme?: string;

package/dist/trmPackage/TrmPackage.js

@@ -54,6 +54,7 @@ class TrmPackage {
         this.registry = registry;
         this.manifest = manifest;
         this._remoteArtifacts = {};
+        this._remoteContent = {};
     }
     setDevclass(devclass) {
         this._devclass = devclass;
@@ -91,21 +92,30 @@ class TrmPackage {
             };
         });
     }
-    fetchRemoteManifest() {
+    fetchRemoteArtifact() {
         return __awaiter(this, arguments, void 0, function* (version = 'latest') {
             if (!this._remoteArtifacts[version]) {
-                const artifact = yield this.registry.getArtifact(this.packageName, version);
-                this._remoteArtifacts[version] = artifact;
+                this._remoteArtifacts[version] = yield this.registry.getArtifact(this.packageName, version);
             }
-            this.manifest = this._remoteArtifacts[version].getManifest();
+            return this._remoteArtifacts[version];
+        });
+    }
+    fetchRemoteManifest() {
+        return __awaiter(this, arguments, void 0, function* (version = 'latest') {
+            const artifact = yield this.fetchRemoteArtifact(version);
+            this.manifest = artifact.getManifest();
             this._remoteArtifacts[this.manifest.get().version] = this._remoteArtifacts[version];
             return this._remoteArtifacts[version].getManifest();
         });
     }
-    fetchRemoteArtifact() {
-        return __awaiter(this, arguments, void 0, function* (version = 'latest') {
-            if (!this._remoteArtifacts[version]) {
-                this._remoteArtifacts[version] = yield this.registry.getArtifact(this.packageName, version);
+    fetchRemoteContent() {
+        return __awaiter(this, arguments, void 0, function* (version = 'latest', r3transConfig) {
+            if (!this._remoteContent[version]) {
+                const artifact = yield this.fetchRemoteArtifact(version);
+                const manifest = artifact.getManifest();
+                const actualVersion = manifest.get().version;
+                this._remoteArtifacts[version] = yield artifact.getContent(r3transConfig);
+                this._remoteArtifacts[actualVersion] = this._remoteArtifacts[version];
             }
             return this._remoteArtifacts[version];
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.2.3",
+  "version": "6.2.5",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",