lhcb-ntuple-wizard-test 2.0.5 → 2.0.6

package/dist/models/yamlFile.d.ts

@@ -9,9 +9,11 @@ interface InfoYamlDefaults {
     automatically_configure: boolean;
     output: string;
 }
-export type InfoYamlType = {
+export type InfoYaml = {
     defaults: InfoYamlDefaults;
-} & Record<string, JobConfig>;
+} & {
+    [K in string as K extends "defaults" ? never : K]?: JobConfig;
+};
 export declare class YamlFile {
     name: string;
     content: string;

package/dist/models/yamlFile.js

@@ -14,15 +14,7 @@ export class YamlFile {
         const uniquePathSet = new Set(rows.flatMap((row) => row.paths));
         const uniquePaths = [...uniquePathSet].sort();
         const pathIndex = new Map(uniquePaths.map((p, i) => [p, i]));
-        const info = {
-            defaults: {
-                application: `DaVinci/${metadata.tupleTools.applicationInfo.DaVinci}`,
-                wg: "OpenData",
-                inform: [],
-                automatically_configure: true,
-                output: "DVNtuple.root",
-            },
-        };
+        const jobs = {};
         for (const row of rows) {
             if (!row.dtt)
                 continue;
@@ -32,8 +24,8 @@ export class YamlFile {
                     continue;
                 const key = `job${jobID}`;
                 const dttFile = row.dtt.getName();
-                if (key in info) {
-                    info[key].options.push(dttFile);
+                if (jobs[key]) {
+                    jobs[key].options.push(dttFile);
                 }
                 else {
                     const job = {
@@ -42,14 +34,23 @@ export class YamlFile {
                     };
                     if (path.includes("MDST")) {
                         const stream = row.lines[0]?.stream;
-                        if (stream) {
+                        if (stream)
                             job.root_in_tes = `/Event/${stream}`;
-                        }
                     }
-                    info[key] = job;
+                    jobs[key] = job;
                 }
             }
         }
+        const info = {
+            defaults: {
+                application: `DaVinci/${metadata.tupleTools.applicationInfo.DaVinci}`,
+                wg: "OpenData",
+                inform: [],
+                automatically_configure: true,
+                output: "DVNtuple.root",
+            },
+            ...jobs,
+        };
         return new YamlFile("info.yaml", yaml.dump(info));
     }
 }

package/dist/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { InfoYamlType, YamlFile } from "../models/yamlFile";
+import { InfoYaml, YamlFile } from "../models/yamlFile";
 import { SavedDttConfig } from "../models/dtt";
 import { RowData } from "../models/rowData";
 import { MetadataContext } from "../providers/MetadataProvider";
@@ -6,7 +6,7 @@ export declare function parseProductionFiles(files: File[], metadata: MetadataCo
     rows: RowData[];
     emails: string[];
 }>;
-export declare function processProductionFiles(metadata: MetadataContext, configs: SavedDttConfig[], infoYaml: InfoYamlType | null): string | {
+export declare function processProductionFiles(metadata: MetadataContext, configs: SavedDttConfig[], infoYaml: InfoYaml | null): string | {
     rows: RowData[];
     emails: string[];
 };

package/dist/utils/utils.js

@@ -61,7 +61,7 @@ async function parseInfoYamlFile(file) {
         const value = input[key];
         if (undefined === value)
             return true;
-        return "object" === typeof value && null !== value && _io2(value);
+        return undefined === value || "object" === typeof value && null !== value && _io2(value);
     }); const _io1 = input => "string" === typeof input.application && "string" === typeof input.wg && (Array.isArray(input.inform) && input.inform.every(elem => "string" === typeof elem)) && "boolean" === typeof input.automatically_configure && "string" === typeof input.output; const _io2 = input => Array.isArray(input.options) && input.options.every(elem => "string" === typeof elem) && ("object" === typeof input.input && null !== input.input && _io3(input.input)) && (undefined === input.root_in_tes || "string" === typeof input.root_in_tes); const _io3 = input => "string" === typeof input.bk_query; const _vo0 = (input, _path, _exceptionable = true) => [("object" === typeof input.defaults && null !== input.defaults || _report(_exceptionable, {
             path: _path + ".defaults",
             expected: "InfoYamlDefaults",
@@ -76,13 +76,13 @@ async function parseInfoYamlFile(file) {
             const value = input[key];
             if (undefined === value)
                 return true;
-            return ("object" === typeof value && null !== value || _report(_exceptionable, {
+            return undefined === value || ("object" === typeof value && null !== value || _report(_exceptionable, {
                 path: _path + __typia_transform__accessExpressionAsString._accessExpressionAsString(key),
-                expected: "JobConfig",
+                expected: "(JobConfig | undefined)",
                 value: value
             })) && _vo2(value, _path + __typia_transform__accessExpressionAsString._accessExpressionAsString(key), true && _exceptionable) || _report(_exceptionable, {
                 path: _path + __typia_transform__accessExpressionAsString._accessExpressionAsString(key),
-                expected: "JobConfig",
+                expected: "(JobConfig | undefined)",
                 value: value
             });
         }).every(flag => flag)].every(flag => flag); const _vo1 = (input, _path, _exceptionable = true) => ["string" === typeof input.application || _report(_exceptionable, {
@@ -147,11 +147,11 @@ async function parseInfoYamlFile(file) {
             _report = __typia_transform__validateReport._validateReport(errors);
             ((input, _path, _exceptionable = true) => ("object" === typeof input && null !== input || _report(true, {
                 path: _path + "",
-                expected: "InfoYamlType",
+                expected: "InfoYaml",
                 value: input
             })) && _vo0(input, _path + "", true) || _report(true, {
                 path: _path + "",
-                expected: "InfoYamlType",
+                expected: "InfoYaml",
                 value: input
             }))(input, "$input", true);
             const success = 0 === errors.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhcb-ntuple-wizard-test",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "An application to access large-scale open data from LHCb",
   "url": "https://gitlab.cern.ch/lhcb-dpa/wp6-analysis-preservation-and-open-data/lhcb-ntuple-wizard-frontend/issues",
   "private": false,

package/dist/models/blobFile.d.ts

@@ -1,12 +0,0 @@
-export interface BlobFileDefaults {
-    application: string;
-    wg: string;
-    inform: string[];
-    automatically_configure: boolean;
-    output: string;
-}
-export interface BlobFile {
-    name: string;
-    defaults: BlobFileDefaults;
-    blob: Blob;
-}

package/dist/models/blobFile.js

@@ -1 +0,0 @@
-export {};