Update argument type (#8)

* Update tests * Update types * Bump version
NASA-AMMOS · Feb 15, 2023 · b56782b · b56782b
1 parent 0d7a7d9
commit b56782b
Show file tree

Hide file tree

Showing 68 changed files with 469 additions and 186 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.15",
+  "version": "1.0.16",
   "license": "MIT",
   "type": "module",
   "repository": {

diff --git a/schema.json b/schema.json
@@ -393,20 +393,36 @@
       "additionalProperties": false,
       "description": "A step argument referencing a local or global variable, or some other symbolic name known to downstream modeling software (such as CONDITION in SEQGEN)",
       "properties": {
-        "symbol": {
+        "name": {
+          "description": "An optional symbol argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The symbol argument type.",
+          "const": "symbol"
+        },
+        "value": {
           "description": "The symbolic name being referenced.",
           "type": "string"
         }
       },
-      "required": ["symbol"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "repeat_argument": {
       "additionalProperties": false,
-      "description": "A repeat argument",
+      "description": "An argument that can be repeated.",
       "properties": {
-        "repeat": {
-          "description": "A repeat argument, there can be a nested repeat argument inside.",
+        "name": {
+          "description": "An optional repeat argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The repeat argument type.",
+          "const": "repeat"
+        },
+        "value": {
+          "description": "A repeat argument value, there can be a nested repeat arguments inside.",
           "type": "array",
           "items": {
             "oneOf": [
@@ -432,56 +448,88 @@
           }
         }
       },
-      "required": ["repeat"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "string_argument": {
       "additionalProperties": false,
       "description": "A step argument containing a string.",
       "properties": {
-        "string": {
-          "description": "The value. The string must be valid.",
+        "name": {
+          "description": "An optional string argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The string type.",
+          "const": "string"
+        },
+        "value": {
+          "description": "A valid string value.",
           "type": "string"
         }
       },
-      "required": ["string"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "number_argument": {
       "additionalProperties": false,
       "description": "A step argument containing a number.",
       "properties": {
-        "number": {
-          "description": "The value. The number must be valid.",
+        "name": {
+          "description": "An optional number argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The number type.",
+          "const": "number"
+        },
+        "value": {
+          "description": "The number value. The number must be valid.",
           "type": "number"
         }
       },
-      "required": ["number"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "boolean_argument": {
       "additionalProperties": false,
       "description": "A step argument containing a boolean.",
       "properties": {
-        "boolean": {
+        "name": {
+          "description": "An optional boolean argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The boolean type.",
+          "const": "boolean"
+        },
+        "value": {
           "description": "The boolean value. The value must be all lowercase.",
           "type": "boolean"
         }
       },
-      "required": ["boolean"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "hex_argument": {
       "additionalProperties": false,
       "description": "A step argument containing an unsigned integer in hexadecimal format.",
       "properties": {
-        "hex": {
-          "description": "The hexadecimal integer, as a string prefixed with 0x. Digits A-F must be uppercase.",
+        "name": {
+          "description": "An optional hex argument name.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The hex type.",
+          "const": "hex"
+        },
+        "value": {
+          "description": "The hexadecimal integer value, as a string prefixed with 0x. Digits A-F must be uppercase.",
           "pattern": "^0x([0-9A-F])+$",
           "type": "string"
         }
       },
-      "required": ["hex"],
+      "required": ["type", "value"],
       "type": "object"
     },
     "variable_declaration": {

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.15'
+  version='1.0.16'
 )
diff --git a/test/invalid-seq-json/activate-extra-property.seq.json b/test/invalid-seq-json/activate-extra-property.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2 with extra property.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/activate-missing-sequence.seq.json b/test/invalid-seq-json/activate-missing-sequence.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2, missing sequence tag.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/activate-missing-time.seq.json b/test/invalid-seq-json/activate-missing-time.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2, missing time tag.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/activate-missing-type.seq.json b/test/invalid-seq-json/activate-missing-type.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2, missing type tag.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/activate-noninteger-engine.seq.json b/test/invalid-seq-json/activate-noninteger-engine.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into noninteger engine.",
       "engine": 2.5,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/activate-nonstring-epoch.seq.json b/test/invalid-seq-json/activate-nonstring-epoch.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2 with nonstring epoch.",
       "engine": 2,
       "epoch": 7,

diff --git a/test/invalid-seq-json/activate-nonstring-sequence.seq.json b/test/invalid-seq-json/activate-nonstring-sequence.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": true }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": true },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Epoch-relative activate step for test.mod into engine 2 with nonstring sequence.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/args-invalid-type.seq.json b/test/invalid-seq-json/args-invalid-type.seq.json
@@ -3,7 +3,7 @@
   "metadata": {},
   "steps": [
     {
-      "args": { "number": 7 },
+      "args": { "type": "number", "value": 7 },
       "description": "Epoch-relative activate step for test.mod into engine 2 with invalid arg type.",
       "engine": 2,
       "epoch": "TEST_EPOCH",

diff --git a/test/invalid-seq-json/command-extra-property.seq.json b/test/invalid-seq-json/command-extra-property.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with extra property.",
       "models": [
         {

diff --git a/test/invalid-seq-json/command-missing-stem.seq.json b/test/invalid-seq-json/command-missing-stem.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with missing stem.",
       "models": [
         {

diff --git a/test/invalid-seq-json/command-missing-time.seq.json b/test/invalid-seq-json/command-missing-time.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with missing time.",
       "models": [
         {

diff --git a/test/invalid-seq-json/command-missing-type.seq.json b/test/invalid-seq-json/command-missing-type.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with missing type.",
       "models": [
         {

diff --git a/test/invalid-seq-json/command-nonarray-models.seq.json b/test/invalid-seq-json/command-nonarray-models.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with nonarray models.",
       "models": 7,
       "stem": "FAKE_COMMAND1",

diff --git a/test/invalid-seq-json/command-nonstring-stem.seq.json b/test/invalid-seq-json/command-nonstring-stem.seq.json
@@ -3,7 +3,12 @@
   "metadata": {},
   "steps": [
     {
-      "args": [{ "number": 30 }, { "number": 4.3 }, { "boolean": false }, { "string": "test_string" }],
+      "args": [
+        { "type": "number", "value": 30 },
+        { "type": "number", "value": 4.3 },
+        { "type": "boolean", "value": false },
+        { "type": "string", "value": "test_string" }
+      ],
       "description": "Absolute-timed standard command step with nonstring stem.",
       "models": [
         {

diff --git a/test/invalid-seq-json/ground-block-extra-property.seq.json b/test/invalid-seq-json/ground-block-extra-property.seq.json
@@ -4,13 +4,13 @@
   "steps": [
     {
       "args": [
-        { "string": "SEQSTR" },
-        { "string": "2019-365T00:00:00" },
-        { "string": "2020-025T00:00:00" },
-        { "string": "BOTH" },
-        { "string": "" },
-        { "string": "" },
-        { "string": "real_time_cmds" }
+        { "type": "string", "value": "SEQSTR" },
+        { "type": "string", "value": "2019-365T00:00:00" },
+        { "type": "string", "value": "2020-025T00:00:00" },
+        { "type": "string", "value": "BOTH" },
+        { "type": "string", "value": "" },
+        { "type": "string", "value": "" },
+        { "type": "string", "value": "real_time_cmds" }
       ],
       "description": "Ground activity step with extra property.",
       "models": [