fix(script-config): add ParallelScripts to CompositeScript

jurassiscripts · May 23, 2020 · bb3d7bf · bb3d7bf
1 parent 772e741
commit bb3d7bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/merge_params.ts b/src/merge_params.ts
@@ -1,4 +1,4 @@
-import { ScriptOptions, FlagsObject } from "./scripts_config.ts";
+import { ScriptOptions, FlagsObject, AllowFlags } from "./scripts_config.ts";
 
 export function mergeParams(
   childParams: ScriptOptions,
@@ -12,8 +12,8 @@ export function mergeParams(
       ...childParams.env,
     },
     allow: {
-      ...normalizeFlags(parentParams.allow),
-      ...normalizeFlags(childParams.allow),
+      ...normalizeFlags(parentParams.allow as string[] | FlagsObject),
+      ...normalizeFlags(childParams.allow as string[] | FlagsObject),
     },
     v8Flags: {
       ...normalizeFlags(parentParams.v8Flags),

diff --git a/src/scripts_config.ts b/src/scripts_config.ts
@@ -50,7 +50,7 @@ export interface ScriptObject extends ScriptOptions {
  * An array of scripts or an object representing script
  * to be executed in parallel
  */
-export type CompositeScript = Array<Script | ParallelScripts>;
+export type CompositeScript = ParallelScripts | Array<Script | ParallelScripts>;
 
 /**
  * An object representing scripts
@@ -87,7 +87,7 @@ export interface ScriptOptions {
    *    - read
    * ```
    */
-  allow?: string[] | FlagsObject;
+  allow?: Array<keyof AllowFlags> | AllowFlags;
   /**
    * A list of boolean V8 flags or
    * a map of V8 option names to values
@@ -142,6 +142,16 @@ export interface ScriptOptions {
   inspectBrk?: string;
 }
 
+export interface AllowFlags {
+  all?: boolean;
+  env?: boolean;
+  hrtime?: boolean;
+  net?: string | boolean;
+  plugin?: boolean;
+  read?: string | boolean;
+  run?: boolean;
+}
+
 export type FlagsObject = Record<string, unknown>;
 
 export type EnvironmentVariables = Record<string, string>;