Merge branch 'main' into pact-integration

sine-fdn · Sep 30, 2024 · 26febf8 · 26febf8
2 parents e086402 + 60cb034
commit 26febf8
Show file tree

Hide file tree

Showing 12 changed files with 1,476 additions and 49 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,10 @@ build: specs/index.html specs/faq.html
 	cp -r $^ specs/diagrams ${RELEASE_DIR}/
 	cp -r TR ${RELEASE_DIR}/
 
+	## and now build the rust docs...
+	make gen/target/doc/ileap_extension/index.html
+	cp -r gen/target/doc ${RELEASE_DIR}/rustdocs
+
 specs/index.html: specs/index.bs ${DIAGRAMS}
 	bikeshed spec $< $@
 
@@ -29,6 +33,10 @@ clean:
 ${MMDC}:
 	npm install @mermaid-js/mermaid-cli
 
+gen/target/doc/ileap_extension/index.html:
+	cd gen && cargo doc --no-deps --document-private-items --all-features
+
+.PHONY: gen/target/doc/ileap_extension/index.html
 
 azure-upload-preview: build
 	az storage blob upload-batch \

diff --git a/gen/Cargo.lock b/gen/Cargo.lock
diff --git a/gen/Cargo.toml b/gen/Cargo.toml
@@ -14,4 +14,6 @@ serde_json = "1.0.96"
 rust_decimal = "1.35.0"
 rust_decimal_macros = "^1.20"
 regex = "1.10.4"
+quickcheck = "1"
+quickcheck_macros = "1"
 uuid = { version = "1.8", features = ["v4", "serde"] }
diff --git a/gen/schemas/hoc.json b/gen/schemas/hoc.json
@@ -135,9 +135,13 @@
           ]
         },
         "energyConsumptionUnit": {
-          "type": [
-            "string",
-            "null"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/EnergyConsumptionUnit"
+            },
+            {
+              "type": "null"
+            }
           ]
         },
         "feedstocks": {
@@ -168,6 +172,15 @@
         "Electric"
       ]
     },
+    "EnergyConsumptionUnit": {
+      "type": "string",
+      "enum": [
+        "l",
+        "kg",
+        "kWh",
+        "MJ"
+      ]
+    },
     "Feedstock": {
       "type": "object",
       "required": [
@@ -178,11 +191,14 @@
           "$ref": "#/definitions/FeedstockType"
         },
         "feedstockPercentage": {
-          "type": [
-            "number",
-            "null"
-          ],
-          "format": "double"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "regionProvenance": {
           "type": [

diff --git a/gen/schemas/tad.json b/gen/schemas/tad.json
@@ -126,11 +126,14 @@
           "$ref": "#/definitions/FeedstockType"
         },
         "feedstockPercentage": {
-          "type": [
-            "number",
-            "null"
-          ],
-          "format": "double"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "regionProvenance": {
           "type": [

diff --git a/gen/schemas/toc.json b/gen/schemas/toc.json
@@ -146,9 +146,13 @@
           ]
         },
         "energyConsumptionUnit": {
-          "type": [
-            "string",
-            "null"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/EnergyConsumptionUnit"
+            },
+            {
+              "type": "null"
+            }
           ]
         },
         "feedstocks": {
@@ -179,6 +183,15 @@
         "Electric"
       ]
     },
+    "EnergyConsumptionUnit": {
+      "type": "string",
+      "enum": [
+        "l",
+        "kg",
+        "kWh",
+        "MJ"
+      ]
+    },
     "Feedstock": {
       "type": "object",
       "required": [
@@ -189,11 +202,14 @@
           "$ref": "#/definitions/FeedstockType"
         },
         "feedstockPercentage": {
-          "type": [
-            "number",
-            "null"
-          ],
-          "format": "double"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "regionProvenance": {
           "type": [