Repeat arg fixes (#10)

* Removed nested repeat args * Changed repeat args so they're an array of arrays * Removed unnecessary oneOf for repeat args
NASA-AMMOS · Feb 16, 2023 · 252e2a2 · 252e2a2
1 parent b56782b
commit 252e2a2
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nasa-jpl/seq-json-schema",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "license": "MIT",
   "type": "module",
   "repository": {

diff --git a/schema.json b/schema.json
@@ -422,29 +422,29 @@
           "const": "repeat"
         },
         "value": {
-          "description": "A repeat argument value, there can be a nested repeat arguments inside.",
+          "description": "A repeat argument value.",
           "type": "array",
           "items": {
-            "oneOf": [
-              {
-                "$ref": "#/$defs/string_argument"
-              },
-              {
-                "$ref": "#/$defs/number_argument"
-              },
-              {
-                "$ref": "#/$defs/boolean_argument"
-              },
-              {
-                "$ref": "#/$defs/symbol_argument"
-              },
-              {
-                "$ref": "#/$defs/hex_argument"
-              },
-              {
-                "$ref": "#/$defs/repeat_argument"
-              }
-            ]
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/$defs/string_argument"
+                },
+                {
+                  "$ref": "#/$defs/number_argument"
+                },
+                {
+                  "$ref": "#/$defs/boolean_argument"
+                },
+                {
+                  "$ref": "#/$defs/symbol_argument"
+                },
+                {
+                  "$ref": "#/$defs/hex_argument"
+                }
+              ]
+            }
           }
         }
       },

diff --git a/setup.py b/setup.py
@@ -14,5 +14,5 @@
   name='seq-json-schema',
   packages=['seq-json-schema'],
   url='https://github.com/NASA-AMMOS/seq-json-schema',
-  version='1.0.16'
+  version='1.0.17'
 )
diff --git a/test/invalid-seq-json/nested-repeat-arg.seq.json b/test/invalid-seq-json/nested-repeat-arg.seq.json
@@ -0,0 +1,15 @@
+{
+  "id": "nested-repeat-arg",
+  "metadata": {},
+  "steps": [
+    {
+      "args": [{ "type": "repeat", "value": [[{ "type": "repeat", "value": [[{ "type": "number", "value": 10 }]] }]] }],
+      "stem": "HELLO",
+      "time": {
+        "tag": "00:00:01",
+        "type": "EPOCH_RELATIVE"
+      },
+      "type": "command"
+    }
+  ]
+}
diff --git a/test/valid-seq-json/all-possible-fields.seq.json b/test/valid-seq-json/all-possible-fields.seq.json
@@ -52,10 +52,16 @@
         {
           "type": "repeat",
           "value": [
-            { "type": "number", "value": 10 },
-            { "type": "string", "value": "another_test" },
-            { "type": "boolean", "value": false },
-            { "type": "repeat", "value": [{ "type": "number", "value": 1 }] }
+            [
+              { "type": "number", "value": 10 },
+              { "type": "string", "value": "another_test" },
+              { "type": "boolean", "value": false }
+            ],
+            [
+              { "type": "number", "value": 5 },
+              { "type": "string", "value": "repeat_test" },
+              { "type": "boolean", "value": true }
+            ]
           ]
         }
       ],
@@ -97,8 +103,10 @@
         {
           "type": "repeat",
           "value": [
-            { "type": "number", "value": 10 },
-            { "type": "string", "value": "another_test" }
+            [
+              { "type": "number", "value": 10 },
+              { "type": "string", "value": "another_test" }
+            ]
           ]
         }
       ],

diff --git a/types.ts b/types.ts
@@ -269,9 +269,9 @@ export interface RepeatArgument {
    */
   type: 'repeat';
   /**
-   * A repeat argument value, there can be a nested repeat arguments inside.
+   * A repeat argument value.
    */
-  value: (StringArgument | NumberArgument | BooleanArgument | SymbolArgument | HexArgument | RepeatArgument)[];
+  value: (StringArgument | NumberArgument | BooleanArgument | SymbolArgument | HexArgument)[][];
 }
 /**
  * Model object that be included with commands to set variables for modeling purposes only, usually to direct sequence execution down a particular branch during modeling.