Merge pull request #352 from betwixt-labs/ext-decorators

fix(extensions): allow multiple decorators
betwixt-labs · Sep 27, 2024 · da8f6db · da8f6db
2 parents accb3e9 + 40b44f5
commit da8f6db
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 51 deletions.
diff --git a/Core/Generators/GeneratorContext.cs b/Core/Generators/GeneratorContext.cs
@@ -349,10 +349,11 @@ private static void WriteDecorators(Utf8JsonWriter writer, List<SchemaDecorator>
         {
             return;
         }
-        writer.WriteStartObject("decorators");
+        writer.WriteStartArray("decorators");
         foreach (var decorator in decorators)
         {
-            writer.WriteStartObject(decorator.Identifier);
+            writer.WriteStartObject();
+            writer.WriteString("identifier", decorator.Identifier);
             if (decorator.Arguments.Count > 0)
             {
                 writer.WriteStartObject("arguments");
@@ -368,7 +369,7 @@ private static void WriteDecorators(Utf8JsonWriter writer, List<SchemaDecorator>
             }
             writer.WriteEndObject();
         }
-        writer.WriteEndObject();
+        writer.WriteEndArray();
     }
 
     private static string GetDefinitionKind(Definition def)

diff --git a/Runtime/TypeScript/package.json b/Runtime/TypeScript/package.json
@@ -41,4 +41,4 @@
     "vitest": "^0.32.2"
   },
   "dependencies": {}
-}
+}
diff --git a/docs/src/content/docs/chords/chordc.mdx b/docs/src/content/docs/chords/chordc.mdx
@@ -1,5 +1,3 @@
-Here's the updated content with a caution note added at the top:
-
 ---
 title: chordc
 ---

diff --git a/extensions/edks/tinygo/chord.json b/extensions/edks/tinygo/chord.json
@@ -49,7 +49,7 @@
     }
   },
   "engine": {
-    "bebopc": "^3.0.0"
+    "bebopc": "^3.1.1"
   },
   "readme": "README.md"
-}
+}
diff --git a/extensions/edks/tinygo/kernel/kernel.go b/extensions/edks/tinygo/kernel/kernel.go
@@ -165,7 +165,7 @@ func deserializeStruct(json gjson.Result) StructDefinition {
 			},
 			Fields: deserializeFields(json.Get("fields")),
 		},
-		IsReadOnly:  json.Get("readonly").Bool(),
+		Mutable:     json.Get("mutable").Bool(),
 		IsFixedSize: json.Get("isFixedSize").Bool(),
 	}
 }
@@ -283,27 +283,26 @@ func deserializeEnumMember(json gjson.Result) EnumMember {
 	}
 }
 
-func deserializeDecorators(json gjson.Result) map[string]Decorator {
-	decorators := make(map[string]Decorator)
-	json.ForEach(func(key, value gjson.Result) bool {
-		decorators[key.String()] = deserializeDecorator(value)
+func deserializeDecorators(json gjson.Result) []Decorator {
+	var decorators []Decorator
+	json.ForEach(func(_, value gjson.Result) bool {
+		decorators = append(decorators, deserializeDecorator(value))
 		return true
 	})
 	return decorators
 }
-
 func deserializeDecorator(json gjson.Result) Decorator {
 	decorator := Decorator{
-		Arguments: make(map[string]DecoratorArgument),
+		Identifier: json.Get("identifier").String(),
+		Arguments:  make(map[string]DecoratorArgument),
 	}
 	arguments := json.Get("arguments")
-	if !arguments.Exists() {
-		return decorator
+	if arguments.Exists() {
+		arguments.ForEach(func(key, value gjson.Result) bool {
+			decorator.Arguments[key.String()] = deserializeDecoratorArgument(value)
+			return true
+		})
 	}
-	arguments.ForEach(func(key, value gjson.Result) bool {
-		decorator.Arguments[key.String()] = deserializeDecoratorArgument(value)
-		return true
-	})
 	return decorator
 }
 
@@ -417,7 +416,8 @@ func (m MapType) IsBaseType() bool {
 }
 
 type Decorator struct {
-	Arguments map[string]DecoratorArgument
+	Identifier string
+	Arguments  map[string]DecoratorArgument
 }
 
 type DecoratorArgument struct {
@@ -432,7 +432,7 @@ type Definition interface {
 type BaseDefinition struct {
 	Kind          string
 	Documentation string
-	Decorators    map[string]Decorator
+	Decorators    []Decorator
 	Parent        string
 }
 
@@ -449,7 +449,7 @@ type FieldsDefinition struct {
 
 type StructDefinition struct {
 	FieldsDefinition
-	IsReadOnly  bool
+	Mutable     bool
 	IsFixedSize bool
 }
 
@@ -474,7 +474,7 @@ func (ed EnumDefinition) Kind() string { return "enum" }
 type EnumMember struct {
 	Documentation string
 	Value         string
-	Decorators    map[string]Decorator
+	Decorators    []Decorator
 }
 
 type UnionDefinition struct {
@@ -491,7 +491,7 @@ type ServiceDefinition struct {
 
 type MethodDefinition struct {
 	Documentation string
-	Decorators    map[string]Decorator
+	Decorators    []Decorator
 	Type          string
 	RequestType   string
 	ResponseType  string
@@ -505,7 +505,7 @@ type ConstantDefinition struct {
 
 type Field struct {
 	Documentation string
-	Decorators    map[string]Decorator
+	Decorators    []Decorator
 	Type          FieldType
 	Index         int
 }

diff --git a/extensions/edks/typescript/chord.json b/extensions/edks/typescript/chord.json
@@ -46,7 +46,7 @@
     }
   },
   "engine": {
-    "bebopc": "^3.0.0"
+    "bebopc": "^3.1.1"
   },
   "readme": "README.md"
 }
diff --git a/extensions/edks/typescript/src/index.ts b/extensions/edks/typescript/src/index.ts
@@ -10,31 +10,36 @@ function generateValidators(context: CompilerContext): string {
   const builder = new IndentedStringBuilder();
 
   for (const [name, definition] of Object.entries(context.definitions)) {
-    if (definition.kind === "struct" && definition.decorators?.validate) {
+    if (definition.kind === "struct" && definition.decorators?.some(d => d.identifier === "validator")) {
       builder.appendLine(`export function validate${name}(record: I${name}): void {`);
       builder.indent(2);
 
       for (const [fieldName, field] of Object.entries(definition.fields)) {
-        if (field.type === 'string' && field.decorators?.length?.arguments) {
-          const { min, max } = field.decorators.length.arguments;
+        if (field.type === 'string') {
+          const lengthDecorator = field.decorators?.find(d => d.identifier === "length");
+          if (lengthDecorator && lengthDecorator.arguments) {
+            const { min, max } = lengthDecorator.arguments;
 
-          if (min?.value !== undefined) {
-            builder.appendLine(`if (record.${fieldName}.length < ${min.value}) {`);
-            builder.appendLine(`  throw new Error(\`${fieldName} must be at least ${min.value} characters long\`);`);
-            builder.appendLine('}');
-          }
+            if (min && min.value !== undefined) {
+              builder.appendLine(`if (record.${fieldName}.length < ${min.value}) {`);
+              builder.appendLine(`  throw new Error(\`${fieldName} must be at least ${min.value} characters long\`);`);
+              builder.appendLine('}');
+            }
 
-          if (max?.value !== undefined) {
-            builder.appendLine(`if (record.${fieldName}.length > ${max.value}) {`);
-            builder.appendLine(`  throw new Error(\`${fieldName} must be no more than ${max.value} characters long\`);`);
-            builder.appendLine('}');
+            if (max && max.value !== undefined) {
+              builder.appendLine(`if (record.${fieldName}.length > ${max.value}) {`);
+              builder.appendLine(`  throw new Error(\`${fieldName} must be no more than ${max.value} characters long\`);`);
+              builder.appendLine('}');
+            }
           }
         }
       }
+
       builder.dedent(2);
       builder.appendLine('}');
       builder.appendLine();
     }
   }
+
   return builder.toString();
 }
diff --git a/extensions/edks/typescript/src/kernel.ts b/extensions/edks/typescript/src/kernel.ts
@@ -183,14 +183,15 @@ export type BaseType = "uint8" | "uint16" | "uint32" | "uint64" | "int8" | "int1
 export type Kind = "enum" | "struct" | "message" | "union" | "service" | "const";
 
 
+export type DecoratorArgument = {
+  type: BaseType;
+  value: string;
+};
+
 export type Decorator = {
-  [key: string]: {
-    arguments?: {
-      [key: string]: {
-        type: BaseType;
-        value: string;
-      };
-    };
+  identifier: string;
+  arguments?: {
+    [key: string]: DecoratorArgument;
   };
 };
 
@@ -209,7 +210,7 @@ export type MapType = {
 
 export type Field<T extends BaseType | "array" | "map"> = {
   documentation?: string;
-  decorators?: Decorator;
+  decorators?: Decorator[];
   type: T;
   index?: number;
   array?: T extends "array" ? ArrayType : never;
@@ -218,14 +219,14 @@ export type Field<T extends BaseType | "array" | "map"> = {
 
 export type EnumMember = {
   documentation?: string;
-  decorators?: Decorator;
+  decorators?: Decorator[];
   value: string;
 };
 
 export type BaseDefinition<K extends Kind> = {
   kind: K;
   documentation?: string;
-  decorators?: Decorator;
+  decorators?: Decorator[];
   minimalEncodedSize: number;
   discriminatorInParent?: number;
   parent?: string;
@@ -260,7 +261,7 @@ export type UnionDefinition = BaseDefinition<"union"> & {
 };
 
 export type Method = {
-  decorators?: Decorator;
+  decorators?: Decorator[];
   documentation?: string;
   type: "Unary" | "DuplexStream" | "ClientStream" | "ServerStream";
   requestType: string;
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,4 @@ @@
         "vitest": "^0.32.2"
       },
       "dependencies": {}
-    }
+    }