update module schema

apigear-io · Feb 14, 2024 · 6cd5eb2 · 6cd5eb2
1 parent aba5edb
commit 6cd5eb2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/pkg/spec/schema/apigear.module.schema.json b/pkg/spec/schema/apigear.module.schema.json
@@ -22,8 +22,8 @@
           "type": "object"
         },
         "name": {
-          "description": "The name of the enum, starting with a letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         }
       },
@@ -45,8 +45,8 @@
           "type": "object"
         },
         "name": {
-          "description": "The name of the enum member, starting with a letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         },
         "value": {
@@ -73,8 +73,8 @@
           "type": "object"
         },
         "name": {
-          "description": "The name of the interface, starting with an letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         },
         "operations": {
@@ -121,8 +121,8 @@
           "type": "object"
         },
         "name": {
-          "description": "A name, must be an identifier, starting with a letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         },
         "readonly": {
@@ -153,8 +153,8 @@
           "type": "object"
         },
         "name": {
-          "description": "A name, starting with a letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         },
         "params": {
@@ -190,8 +190,8 @@
           "type": "object"
         },
         "name": {
-          "description": "The name of the struct, starting with an letter, followed by letters, numbers and underscores.",
-          "pattern": "^[a-zA-Z][0-9A-Za-z_]+$",
+          "description": "A name starts with a letter, followed by zero-or-more letters, numbers or underscores.",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$",
           "type": "string"
         }
       },
@@ -252,8 +252,8 @@
       "type": "object"
     },
     "name": {
-      "description": "module name, should be a valid module identifier, starting with a letter, followed by letters, numbers and dot (e.g. 0.1 or 0.1.0).",
-      "pattern": "^[a-zA-Z][0-9A-Za-z_]+([.][0-9A-Za-z_]+)*$",
+      "description": "module name, starts with a letter, followed by letters, numbers, underscores or dots (e.g. a.b.c)",
+      "pattern": "^[a-zA-Z][0-9A-Za-z_.]*$",
       "type": "string"
     },
     "schema": {

diff --git a/pkg/spec/schema/apigear.module.schema.yaml b/pkg/spec/schema/apigear.module.schema.yaml
@@ -39,8 +39,8 @@ properties:
     default: "apigear.module/1.0"
   name:
     type: string
-    description: module name, should be a valid module identifier, starting with a letter, followed by letters, numbers and dot (e.g. 0.1 or 0.1.0).
-    pattern: "^[a-zA-Z][0-9A-Za-z_]+([.][0-9A-Za-z_]+)*$"
+    description: module name, starts with a letter, followed by letters, numbers, underscores or dots (e.g. a.b.c)
+    pattern: "^[a-zA-Z][0-9A-Za-z_.]*$"
   version:
     type: string
     description: module version, should be a major and minor and an optional patch version, separated by a dot.
@@ -77,8 +77,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "A name, must be an identifier, starting with a letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the type."
@@ -121,8 +121,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "The name of the interface, starting with an letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the interface."
@@ -152,8 +152,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "The name of the struct, starting with an letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the struct."
@@ -173,8 +173,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "The name of the enum, starting with a letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the enum."
@@ -193,8 +193,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "A name, starting with a letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the operation."
@@ -216,8 +216,8 @@ definitions:
     properties:
       name: 
         type: string
-        description: "The name of the enum member, starting with a letter, followed by letters, numbers and underscores."
-        pattern: "^[a-zA-Z][0-9A-Za-z_]+$"
+        description: "A name starts with a letter, followed by zero-or-more letters, numbers or underscores."
+        pattern: "^[a-zA-Z][0-9A-Za-z_]*$"
       description: 
         type: string
         description: "A description of the enum member."