pr feedback

docs/docs/04-standard-library/02-std/api-reference.md

@@ -2090,8 +2090,6 @@ Struct.fromJson(json: Json);
 
 Converts a Json to a Struct.
 
-This macro takes a Json object and the Struct definition file name then calls the validate method
-
 ###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Struct.fromJson.parameter.json"></a>
 
 - *Type:* <a href="#@winglang/sdk.std.Json">Json</a>

libs/wingc/src/jsify.rs

@@ -676,7 +676,7 @@ impl<'a> JSifier<'a> {
 		// Any parents we need to get their properties
 		for e in extends {
 			code.line(format!(
-				"...require(\"{}\")().getSchema().properties,",
+				"...require(\"{}\")().jsonSchema().properties,",
 				struct_filename(&e.root.name)
 			))
 		}
@@ -710,7 +710,7 @@ impl<'a> JSifier<'a> {
 		let mut required: Vec<String> = vec![]; // fields that are required
 		let mut dependencies: Vec<String> = vec![]; // schemas that need added to validator
 
-		code.open("static getSchema() {".to_string());
+		code.open("static jsonSchema() {".to_string());
 		code.open("return {");
 		code.line(format!("id: \"/{}\",", name));
 		code.line("type: \"object\",".to_string());
@@ -740,7 +740,7 @@ impl<'a> JSifier<'a> {
 		// pull in all required fields from parent structs
 		for e in extends {
 			code.line(format!(
-				"...require(\"{}\")().getSchema().required,",
+				"...require(\"{}\")().jsonSchema().required,",
 				struct_filename(&e.root.name)
 			));
 		}
@@ -751,14 +751,14 @@ impl<'a> JSifier<'a> {
 		code.open("$defs: {");
 		for dep in &dependencies {
 			code.line(format!(
-				"\"{}\": {{ type: \"object\", \"properties\": require(\"{}\")().getSchema().properties }},",
+				"\"{}\": {{ type: \"object\", \"properties\": require(\"{}\")().jsonSchema().properties }},",
 				dep,
 				struct_filename(&dep)
 			));
 		}
 		for e in extends {
 			code.line(format!(
-				"...require(\"{}\")().getSchema().$defs,",
+				"...require(\"{}\")().jsonSchema().$defs,",
 				struct_filename(&e.root.name)
 			));
 		}
@@ -769,7 +769,7 @@ impl<'a> JSifier<'a> {
 
 		// create _validate() function
 		code.open("static fromJson(obj) {");
-		code.line("return stdStruct._validate(obj, this.getSchema())");
+		code.line("return stdStruct._validate(obj, this.jsonSchema())");
 		code.close("}");
 
 		// create _toInflightType function that just requires the generated struct file

libs/wingc/src/type_check.rs

@@ -4290,7 +4290,10 @@ impl<'a> TypeChecker<'a> {
 						}
 					}
 					Type::Struct(ref s) => {
-						if property.name == "fromJson" || property.name == "tryFromJson" {
+            let from_json = "fromJson";
+            let try_from_json = "tryFromJson";
+
+						if property.name == from_json || property.name == try_from_json {
 							// we need to validate that only structs with all valid json fields can have a fromJson method
 							for (name, field) in s.fields(true) {
 								if !field.has_json_representation() {

libs/wingsdk/src/std/struct.ts

@@ -19,8 +19,6 @@ export class Struct {
   /**
    * Converts a Json to a Struct
    *
-   * This macro takes a Json object and the Struct definition file name then calls the validate method
-   *
    * @macro ($self$.fromJson($args$))
    */
   public static fromJson(json: Json): T1 {

tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class CheckHitCountOptions {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/CheckHitCountOptions",
         type: "object",
@@ -21,12 +21,12 @@ module.exports = function(stdStruct, fromInline) {
           "count",
         ],
         $defs: {
-          "Source": { type: "object", "properties": require("./Source.Struct.js")().getSchema().properties },
+          "Source": { type: "object", "properties": require("./Source.Struct.js")().jsonSchema().properties },
         }
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./CheckHitCountOptions.Struct.js")(${ context._lift(stdStruct) })`);

tools/hangar/__snapshots__/test_corpus/valid/bring_local.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Point {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Point",
         type: "object",
@@ -21,7 +21,7 @@ module.exports = function(stdStruct, fromInline) {
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Point.Struct.js")(${ context._lift(stdStruct) })`);

tools/hangar/__snapshots__/test_corpus/valid/deep_equality.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Cat {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Cat",
         type: "object",
@@ -21,7 +21,7 @@ module.exports = function(stdStruct, fromInline) {
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Cat.Struct.js")(${ context._lift(stdStruct) })`);

tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Bar {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Bar",
         type: "object",
@@ -15,12 +15,12 @@ module.exports = function(stdStruct, fromInline) {
           "foo",
         ],
         $defs: {
-          "Foo": { type: "object", "properties": require("./Foo.Struct.js")().getSchema().properties },
+          "Foo": { type: "object", "properties": require("./Foo.Struct.js")().jsonSchema().properties },
         }
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Bar.Struct.js")(${ context._lift(stdStruct) })`);

tools/hangar/__snapshots__/test_corpus/valid/optionals.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Name {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Name",
         type: "object",
@@ -20,7 +20,7 @@ module.exports = function(stdStruct, fromInline) {
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Name.Struct.js")(${ context._lift(stdStruct) })`);
@@ -35,7 +35,7 @@ module.exports = function(stdStruct, fromInline) {
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Payload {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Payload",
         type: "object",
@@ -48,12 +48,12 @@ module.exports = function(stdStruct, fromInline) {
           "a",
         ],
         $defs: {
-          "cloud": { type: "object", "properties": require("./cloud.Struct.js")().getSchema().properties },
+          "cloud": { type: "object", "properties": require("./cloud.Struct.js")().jsonSchema().properties },
         }
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Payload.Struct.js")(${ context._lift(stdStruct) })`);

tools/hangar/__snapshots__/test_corpus/valid/store.w_compile_tf-aws.md

@@ -4,7 +4,7 @@
 ```js
 module.exports = function(stdStruct, fromInline) {
   class Point {
-    static getSchema() {
+    static jsonSchema() {
       return {
         id: "/Point",
         type: "object",
@@ -21,7 +21,7 @@ module.exports = function(stdStruct, fromInline) {
       }
     }
     static fromJson(obj) {
-      return stdStruct._validate(obj, this.getSchema())
+      return stdStruct._validate(obj, this.jsonSchema())
     }
     static _toInflightType(context) {
       return fromInline(`require("./Point.Struct.js")(${ context._lift(stdStruct) })`);