@algorandfoundation/algokit-client-generator 4.0.0-beta.2 → 4.0.0-beta.4

package/schema/arc56.schema.json.mjs

@@ -6,12 +6,35 @@ var definitions = {
 		type: "string"
 	},
 	AVMBytes: {
-		"const": "bytes",
+		"const": "AVMBytes",
 		description: "Raw byteslice without the length prefixed that is specified in ARC-4",
 		type: "string"
 	},
+	AVMString: {
+		"const": "AVMString",
+		description: "A utf-8 string without the length prefix that is specified in ARC-4",
+		type: "string"
+	},
+	AVMType: {
+		anyOf: [
+			{
+				$ref: "#/definitions/AVMBytes"
+			},
+			{
+				$ref: "#/definitions/AVMString"
+			},
+			{
+				$ref: "#/definitions/AVMUint64"
+			}
+		],
+		description: "A native AVM type"
+	},
+	AVMUint64: {
+		"const": "AVMUint64",
+		description: "A 64-bit unsigned integer",
+		type: "string"
+	},
 	Arc56Contract: {
-		additionalProperties: false,
 		description: "Describes the entire contract. This interface is an extension of the interface described in ARC-4",
 		properties: {
 			arcs: {
@@ -22,7 +45,6 @@ var definitions = {
 				type: "array"
 			},
 			bareActions: {
-				additionalProperties: false,
 				description: "Supported bare actions for the contract. An action is a combination of call/create and an OnComplete",
 				properties: {
 					call: {
@@ -60,7 +82,6 @@ var definitions = {
 				type: "object"
 			},
 			byteCode: {
-				additionalProperties: false,
 				description: "The compiled bytecode for the application. MUST be omitted if included as part of ARC23",
 				properties: {
 					approval: {
@@ -79,7 +100,6 @@ var definitions = {
 				type: "object"
 			},
 			compilerInfo: {
-				additionalProperties: false,
 				description: "Information used to get the given byteCode and/or PC values in sourceInfo. MUST be given if byteCode or PC values are present",
 				properties: {
 					compiler: {
@@ -91,10 +111,9 @@ var definitions = {
 						type: "string"
 					},
 					compilerVersion: {
-						additionalProperties: false,
 						description: "Compiler version information",
 						properties: {
-							commit: {
+							commitHash: {
 								type: "string"
 							},
 							major: {
@@ -145,8 +164,6 @@ var definitions = {
 			},
 			networks: {
 				additionalProperties: {
-					additionalProperties: false,
-					description: "The key is the base64 genesis hash of the network, and the value contains information about the deployed contract in the network indicated by the key. A key containing the human-readable name of the network MAY be included, but the corresponding genesis hash key MUST also be defined",
 					properties: {
 						appID: {
 							description: "The app ID of the deployed contract in this network",
@@ -158,12 +175,11 @@ var definitions = {
 					],
 					type: "object"
 				},
-				description: "Optional object listing the contract instances across different networks",
+				description: "Optional object listing the contract instances across different networks. The key is the base64 genesis hash of the network, and the value contains information about the deployed contract in the network indicated by the key. A key containing the human-readable name of the network MAY be included, but the corresponding genesis hash key MUST also be define",
 				type: "object"
 			},
 			scratchVariables: {
 				additionalProperties: {
-					additionalProperties: false,
 					properties: {
 						slot: {
 							type: "number"
@@ -174,7 +190,7 @@ var definitions = {
 									$ref: "#/definitions/ABIType"
 								},
 								{
-									$ref: "#/definitions/AVMBytes"
+									$ref: "#/definitions/AVMType"
 								},
 								{
 									$ref: "#/definitions/StructName"
@@ -192,7 +208,6 @@ var definitions = {
 				type: "object"
 			},
 			source: {
-				additionalProperties: false,
 				description: "The pre-compiled TEAL that may contain template variables. MUST be omitted if included as part of ARC23",
 				properties: {
 					approval: {
@@ -211,7 +226,6 @@ var definitions = {
 				type: "object"
 			},
 			sourceInfo: {
-				additionalProperties: false,
 				description: "Information about the TEAL programs",
 				properties: {
 					approval: {
@@ -236,10 +250,8 @@ var definitions = {
 				type: "object"
 			},
 			state: {
-				additionalProperties: false,
 				properties: {
 					keys: {
-						additionalProperties: false,
 						description: "Mapping of human-readable names to StorageKey objects",
 						properties: {
 							box: {
@@ -269,7 +281,6 @@ var definitions = {
 						type: "object"
 					},
 					maps: {
-						additionalProperties: false,
 						description: "Mapping of human-readable names to StorageMap objects",
 						properties: {
 							box: {
@@ -299,11 +310,9 @@ var definitions = {
 						type: "object"
 					},
 					schema: {
-						additionalProperties: false,
 						description: "Defines the values that should be used for GlobalNumUint, GlobalNumByteSlice, LocalNumUint, and LocalNumByteSlice when creating the application",
 						properties: {
 							global: {
-								additionalProperties: false,
 								properties: {
 									bytes: {
 										type: "number"
@@ -319,7 +328,6 @@ var definitions = {
 								type: "object"
 							},
 							local: {
-								additionalProperties: false,
 								properties: {
 									bytes: {
 										type: "number"
@@ -351,14 +359,16 @@ var definitions = {
 			},
 			structs: {
 				additionalProperties: {
-					$ref: "#/definitions/StructFields"
+					items: {
+						$ref: "#/definitions/StructField"
+					},
+					type: "array"
 				},
-				description: "Named structs use by the application",
+				description: "Named structs use by the application. Each struct field appears in the same order as ABI encoding.",
 				type: "object"
 			},
 			templateVariables: {
 				additionalProperties: {
-					additionalProperties: false,
 					properties: {
 						type: {
 							anyOf: [
@@ -366,7 +376,7 @@ var definitions = {
 									$ref: "#/definitions/ABIType"
 								},
 								{
-									$ref: "#/definitions/AVMBytes"
+									$ref: "#/definitions/AVMType"
 								},
 								{
 									$ref: "#/definitions/StructName"
@@ -399,13 +409,11 @@ var definitions = {
 		type: "object"
 	},
 	Event: {
-		additionalProperties: false,
 		description: "ARC-28 event",
 		properties: {
 			args: {
 				description: "The arguments of the event, in order",
 				items: {
-					additionalProperties: false,
 					properties: {
 						desc: {
 							description: "Optional, user-friendly description for the argument",
@@ -421,7 +429,7 @@ var definitions = {
 						},
 						type: {
 							$ref: "#/definitions/ABIType",
-							description: "The type of the argument"
+							description: "The type of the argument. The `struct` field should also be checked to determine if this return value is a struct."
 						}
 					},
 					required: [
@@ -447,11 +455,9 @@ var definitions = {
 		type: "object"
 	},
 	Method: {
-		additionalProperties: false,
 		description: "Describes a method in the contract. This interface is an extension of the interface described in ARC-4",
 		properties: {
 			actions: {
-				additionalProperties: false,
 				description: "an action is a combination of call/create and an OnComplete",
 				properties: {
 					call: {
@@ -491,11 +497,45 @@ var definitions = {
 			args: {
 				description: "The arguments of the method, in order",
 				items: {
-					additionalProperties: false,
 					properties: {
 						defaultValue: {
-							description: "The default value that clients should use. MUST be base64 encoded bytes",
-							type: "string"
+							description: "The default value that clients should use.",
+							properties: {
+								data: {
+									description: "Base64 encoded bytes or uint64",
+									type: [
+										"string",
+										"number"
+									]
+								},
+								source: {
+									description: "Where the default value is coming from\n- box: The data key signifies the box key to read the value from\n- global: The data key signifies the global state key to read the value from\n- local: The data key signifies the local state key to read the value from (for the sender)\n- literal: the value is a literal and should be passed directly as the argument",
+									"enum": [
+										"box",
+										"global",
+										"local",
+										"literal"
+									],
+									type: "string"
+								},
+								type: {
+									anyOf: [
+										{
+											$ref: "#/definitions/ABIType"
+										},
+										{
+											$ref: "#/definitions/AVMType"
+										}
+									],
+									description: "How the data is encoded. This is the encoding for the data provided here, not the arg type"
+								}
+							},
+							required: [
+								"data",
+								"type",
+								"source"
+							],
+							type: "object"
 						},
 						desc: {
 							description: "Optional, user-friendly description for the argument",
@@ -511,7 +551,7 @@ var definitions = {
 						},
 						type: {
 							$ref: "#/definitions/ABIType",
-							description: "The type of the argument"
+							description: "The type of the argument. The `struct` field should also be checked to determine if this arg is a struct."
 						}
 					},
 					required: [
@@ -541,7 +581,6 @@ var definitions = {
 				type: "boolean"
 			},
 			recommendations: {
-				additionalProperties: false,
 				description: "Information that clients can use when calling the method",
 				properties: {
 					accounts: {
@@ -566,7 +605,6 @@ var definitions = {
 						type: "array"
 					},
 					boxes: {
-						additionalProperties: false,
 						description: "Recommended box references to include",
 						properties: {
 							app: {
@@ -601,7 +639,6 @@ var definitions = {
 				type: "object"
 			},
 			returns: {
-				additionalProperties: false,
 				description: "Information about the method's return value",
 				properties: {
 					desc: {
@@ -614,7 +651,7 @@ var definitions = {
 					},
 					type: {
 						$ref: "#/definitions/ABIType",
-						description: "The type of the return value, or \"void\" to indicate no return value."
+						description: "The type of the return value, or \"void\" to indicate no return value. The `struct` field should also be checked to determine if this return value is a struct."
 					}
 				},
 				required: [
@@ -632,7 +669,6 @@ var definitions = {
 		type: "object"
 	},
 	SourceInfo: {
-		additionalProperties: true,
 		properties: {
 			disassembledTeal: {
 				description: "The line of the dissasembled TEAL this line of pre-compiled TEAL corresponds to",
@@ -657,7 +693,6 @@ var definitions = {
 		type: "object"
 	},
 	StorageKey: {
-		additionalProperties: false,
 		description: "Describes a single key in app storage",
 		properties: {
 			desc: {
@@ -674,7 +709,7 @@ var definitions = {
 						$ref: "#/definitions/ABIType"
 					},
 					{
-						$ref: "#/definitions/AVMBytes"
+						$ref: "#/definitions/AVMType"
 					},
 					{
 						$ref: "#/definitions/StructName"
@@ -688,7 +723,7 @@ var definitions = {
 						$ref: "#/definitions/ABIType"
 					},
 					{
-						$ref: "#/definitions/AVMBytes"
+						$ref: "#/definitions/AVMType"
 					},
 					{
 						$ref: "#/definitions/StructName"
@@ -705,7 +740,6 @@ var definitions = {
 		type: "object"
 	},
 	StorageMap: {
-		additionalProperties: false,
 		description: "Describes a mapping of key-value pairs in storage",
 		properties: {
 			desc: {
@@ -718,7 +752,7 @@ var definitions = {
 						$ref: "#/definitions/ABIType"
 					},
 					{
-						$ref: "#/definitions/AVMBytes"
+						$ref: "#/definitions/AVMType"
 					},
 					{
 						$ref: "#/definitions/StructName"
@@ -736,7 +770,7 @@ var definitions = {
 						$ref: "#/definitions/ABIType"
 					},
 					{
-						$ref: "#/definitions/AVMBytes"
+						$ref: "#/definitions/AVMType"
 					},
 					{
 						$ref: "#/definitions/StructName"
@@ -751,18 +785,35 @@ var definitions = {
 		],
 		type: "object"
 	},
-	StructFields: {
-		additionalProperties: {
-			anyOf: [
-				{
-					$ref: "#/definitions/ABIType"
-				},
-				{
-					$ref: "#/definitions/StructFields"
-				}
-			]
+	StructField: {
+		description: "Information about a single field in a struct",
+		properties: {
+			name: {
+				description: "The name of the struct field",
+				type: "string"
+			},
+			type: {
+				anyOf: [
+					{
+						$ref: "#/definitions/ABIType"
+					},
+					{
+						$ref: "#/definitions/StructName"
+					},
+					{
+						items: {
+							$ref: "#/definitions/StructField"
+						},
+						type: "array"
+					}
+				],
+				description: "The type of the struct field's value"
+			}
 		},
-		description: "Mapping of named structs to the ABI type of their fields",
+		required: [
+			"name",
+			"type"
+		],
 		type: "object"
 	},
 	StructName: {

package/schema/arc56.schema.json.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"arc56.schema.json.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"arc56.schema.json.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/schema/load.js

@@ -11,7 +11,13 @@ async function loadApplicationJson(appJsonPath) {
     const fs = await import('fs');
     if (!fs.existsSync(appJsonPath))
         boom.boom(`Could not find application.json file at ${appJsonPath}`);
-    const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'));
+    let jsonText = fs.readFileSync(appJsonPath, 'utf-8');
+    let file = JSON.parse(jsonText);
+    // Temporary to get backwards compatibility with TEALScript draft ARC-56
+    if (!('contract' in file) /* ARC-56 */) {
+        jsonText = jsonText.replace(/ype":\s*"bytes"/g, 'ype":"AVMBytes"').replace(/import\(.+?\)\./g, '');
+        file = JSON.parse(jsonText);
+    }
     return validateApplicationJson(file, appJsonPath);
 }
 function validateApplicationJson(json, appJsonPath) {

package/schema/load.js.map

@@ -1 +1 @@
-{"version":3,"file":"load.js","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'))\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":["boom","Validator","contractSchema","arc32Schema","arc32ToArc56","arc56Schema"],"mappings":";;;;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAAA,SAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;AAE/F,IAAA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9D,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAAA,SAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAIC,oBAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAACC,uBAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEC,0BAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAAH,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAOI,oBAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAIH,oBAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEI,oBAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAAL,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;;"}
+{"version":3,"file":"load.js","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  let jsonText = fs.readFileSync(appJsonPath, 'utf-8')\n  let file = JSON.parse(jsonText)\n  // Temporary to get backwards compatibility with TEALScript draft ARC-56\n  if (!('contract' in file) /* ARC-56 */) {\n    jsonText = jsonText.replace(/ype\":\\s*\"bytes\"/g, 'ype\":\"AVMBytes\"').replace(/import\\(.+?\\)\\./g, '')\n    file = JSON.parse(jsonText)\n  }\n\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":["boom","Validator","contractSchema","arc32Schema","arc32ToArc56","arc56Schema"],"mappings":";;;;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAAA,SAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;IAE/F,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACpD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;;IAE/B,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,eAAe;AACtC,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAClG,QAAA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;KAC5B;AAED,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAAA,SAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAIC,oBAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAACC,uBAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEC,0BAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAAH,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAOI,oBAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAIH,oBAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEI,oBAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAAL,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;;"}

package/schema/load.mjs

@@ -9,7 +9,13 @@ async function loadApplicationJson(appJsonPath) {
     const fs = await import('fs');
     if (!fs.existsSync(appJsonPath))
         boom(`Could not find application.json file at ${appJsonPath}`);
-    const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'));
+    let jsonText = fs.readFileSync(appJsonPath, 'utf-8');
+    let file = JSON.parse(jsonText);
+    // Temporary to get backwards compatibility with TEALScript draft ARC-56
+    if (!('contract' in file) /* ARC-56 */) {
+        jsonText = jsonText.replace(/ype":\s*"bytes"/g, 'ype":"AVMBytes"').replace(/import\(.+?\)\./g, '');
+        file = JSON.parse(jsonText);
+    }
     return validateApplicationJson(file, appJsonPath);
 }
 function validateApplicationJson(json, appJsonPath) {

package/schema/load.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"load.mjs","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'))\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":[],"mappings":";;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAA,IAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;AAE/F,IAAA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9D,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAA,IAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAO,YAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;"}
+{"version":3,"file":"load.mjs","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  let jsonText = fs.readFileSync(appJsonPath, 'utf-8')\n  let file = JSON.parse(jsonText)\n  // Temporary to get backwards compatibility with TEALScript draft ARC-56\n  if (!('contract' in file) /* ARC-56 */) {\n    jsonText = jsonText.replace(/ype\":\\s*\"bytes\"/g, 'ype\":\"AVMBytes\"').replace(/import\\(.+?\\)\\./g, '')\n    file = JSON.parse(jsonText)\n  }\n\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":[],"mappings":";;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAA,IAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;IAE/F,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACpD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;;IAE/B,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,eAAe;AACtC,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAClG,QAAA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;KAC5B;AAED,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAA,IAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAO,YAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;"}