refactor!: restrict addon name to valid programming variable name (#49)

TEN-framework · Sep 26, 2024 · ad6cebe · ad6cebe
1 parent ff084e5
commit ad6cebe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/core/src/ten_rust/src/json_schema/data/manifest.schema.json b/core/src/ten_rust/src/json_schema/data/manifest.schema.json
@@ -81,7 +81,7 @@
             "$ref": "#/$defs/packageType"
           },
           "name": {
-            "$ref": "#/$defs/notEmptyString"
+            "$ref": "#/$defs/alphanumericCharacters"
           },
           "version": {
             "$ref": "#/$defs/versionRequirement"
@@ -383,7 +383,7 @@
       "$ref": "#/$defs/packageType"
     },
     "name": {
-      "$ref": "#/$defs/notEmptyString"
+      "$ref": "#/$defs/alphanumericCharacters"
     },
     "version": {
       "$ref": "#/$defs/version"

diff --git a/core/src/ten_rust/src/json_schema/data/property.schema.json b/core/src/ten_rust/src/json_schema/data/property.schema.json
@@ -88,10 +88,10 @@
           "$ref": "#/$defs/notEmptyString"
         },
         "extension_group": {
-          "$ref": "#/$defs/addonInstance"
+          "$ref": "#/$defs/notEmptyString"
         },
         "extension": {
-          "$ref": "#/$defs/addonInstance"
+          "$ref": "#/$defs/notEmptyString"
         },
         "msg_conversion": {
           "type": "object",
@@ -165,10 +165,10 @@
           "$ref": "#/$defs/notEmptyString"
         },
         "extension_group": {
-          "$ref": "#/$defs/addonInstance"
+          "$ref": "#/$defs/notEmptyString"
         },
         "extension": {
-          "$ref": "#/$defs/addonInstance"
+          "$ref": "#/$defs/notEmptyString"
         },
         "msg_conversion": {
           "$ref": "#/$defs/msgConversion"
@@ -194,7 +194,7 @@
           "$ref": "#/$defs/notEmptyString"
         },
         "addon": {
-          "$ref": "#/$defs/notEmptyString"
+          "$ref": "#/$defs/alphanumericCharacters"
         },
         "app": {
           "$ref": "#/$defs/notEmptyString"
@@ -376,29 +376,6 @@
         "$ref": "#/$defs/dataDest"
       }
     },
-    "addonInstance": {
-      "oneOf": [
-        {
-          "$ref": "#/$defs/notEmptyString"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "required": [
-            "addon",
-            "name"
-          ],
-          "properties": {
-            "addon": {
-              "$ref": "#/$defs/notEmptyString"
-            },
-            "name": {
-              "$ref": "#/$defs/notEmptyString"
-            }
-          }
-        }
-      ]
-    },
     "validPropertyObject": {
       "type": "object",
       "propertyNames": { // The property name should be alphanumericCharacters.