Fix: Storage Typescript Signature Generation (#114)

* Adding WASM-specific target for building, and enabling typescript signature generation Signed-off-by: Shivansh Vij <[email protected]> * Updating changelog and bumping versions Signed-off-by: Shivansh Vij <[email protected]> --------- Signed-off-by: Shivansh Vij <[email protected]>
loopholelabs · Oct 5, 2023 · d435a5d · d435a5d
1 parent b797dc2
commit d435a5d
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v0.4.4] - 2023-08-05
+
+### Features
+
+- Added ability to compile with WASM-32 support (no WASI)
+
+### Fixes
+
+- Fixed a bug where the signature generation would not generate typescript signatures
+
 ## [v0.4.3] - 2023-08-04
 
 ### Changes
@@ -271,7 +281,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Initial release of the Scale Runtime library.
 
-[unreleased]: https://github.com/loopholelabs/scale/compare/v0.4.3...HEAD
+[unreleased]: https://github.com/loopholelabs/scale/compare/v0.4.4...HEAD
+[v0.4.4]: https://github.com/loopholelabs/scale/compare/v0.4.4
 [v0.4.3]: https://github.com/loopholelabs/scale/compare/v0.4.3
 [v0.4.2]: https://github.com/loopholelabs/scale/compare/v0.4.2
 [v0.4.1]: https://github.com/loopholelabs/scale/compare/v0.4.1

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scale_rs"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 description = "Scale is a framework for building high-performance plugin systems into any application, all powered by WebAssembly."
 homepage = "https://scale.sh"

diff --git a/build/build.go b/build/build.go
@@ -20,4 +20,5 @@ type Target int
 
 const (
 	WASITarget Target = iota
+	WASMTarget
 )
diff --git a/build/golang.go b/build/golang.go
@@ -196,6 +196,8 @@ func LocalGolang(options *LocalGolangOptions) (*scalefunc.Schema, error) {
 	switch options.Target {
 	case WASITarget:
 		target = "wasi"
+	case WASMTarget:
+		target = "wasm"
 	default:
 		return nil, fmt.Errorf("unknown build target %d", options.Target)
 	}

diff --git a/build/rust.go b/build/rust.go
@@ -173,6 +173,8 @@ func LocalRust(options *LocalRustOptions) (*scalefunc.Schema, error) {
 	switch options.Target {
 	case WASITarget:
 		target = "wasm32-wasi"
+	case WASMTarget:
+		target = "wasm32-unknown-unknown"
 	default:
 		return nil, fmt.Errorf("unknown build target %d", options.Target)
 	}

diff --git a/build/typescript.go b/build/typescript.go
@@ -167,6 +167,8 @@ func LocalTypescript(options *LocalTypescriptOptions) (*scalefunc.Schema, error)
 	switch options.Target {
 	case WASITarget:
 		target = api.PlatformNode
+	case WASMTarget:
+		target = api.PlatformBrowser
 	default:
 		return nil, fmt.Errorf("unknown build target %d", options.Target)
 	}

diff --git a/integration/golang_tests/generated/generated.go b/integration/golang_tests/generated/generated.go
diff --git a/integration/golang_tests/host_signature/host.go b/integration/golang_tests/host_signature/host.go
diff --git a/integration/golang_tests/host_signature/types.go b/integration/golang_tests/host_signature/types.go
diff --git a/integration/golang_tests/signature/guest.go b/integration/golang_tests/signature/guest.go
diff --git a/integration/golang_tests/signature/types.go b/integration/golang_tests/signature/types.go
diff --git a/integration/rust_tests/generated/generated.rs b/integration/rust_tests/generated/generated.rs
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: generated
 
 #![allow(dead_code)]

diff --git a/integration/rust_tests/signature/guest.rs b/integration/rust_tests/signature/guest.rs
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local_example_latest_guest
 
 pub mod types;

diff --git a/integration/rust_tests/signature/types.rs b/integration/rust_tests/signature/types.rs
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local_example_latest_guest
 
 #![allow(dead_code)]

diff --git a/integration/typescript_tests/generated/generated.d.ts b/integration/typescript_tests/generated/generated.d.ts
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: generated
 
 import { Encoder, Decoder, Kind } from "@loopholelabs/polyglot"

diff --git a/integration/typescript_tests/generated/generated.js b/integration/typescript_tests/generated/generated.js
diff --git a/integration/typescript_tests/generated/generated.js.map b/integration/typescript_tests/generated/generated.js.map
diff --git a/integration/typescript_tests/host_signature/index.ts b/integration/typescript_tests/host_signature/index.ts
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local-example-latest-host
 
 /* eslint no-bitwise: off */

diff --git a/integration/typescript_tests/host_signature/types.ts b/integration/typescript_tests/host_signature/types.ts
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local-example-latest-host
 
 import { Encoder, Decoder, Kind } from "@loopholelabs/polyglot"

diff --git a/integration/typescript_tests/signature/index.ts b/integration/typescript_tests/signature/index.ts
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local-example-latest-guest
 
 /* eslint no-bitwise: off */

diff --git a/integration/typescript_tests/signature/types.ts b/integration/typescript_tests/signature/types.ts
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: local-example-latest-guest
 
 import { Encoder, Decoder, Kind } from "@loopholelabs/polyglot"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loopholelabs/scale",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Scale is a framework for building high-performance plugin systems into any application, all powered by WebAssembly.",
   "source": "index.ts",
   "types": "types.d.ts",

diff --git a/signature/converter/converter_tests/generated.go b/signature/converter/converter_tests/generated.go
diff --git a/signature/generator/golang/generated.txt b/signature/generator/golang/generated.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature v0.4.3, DO NOT EDIT.
+// Code generated by scale-signature v0.4.4, DO NOT EDIT.
 // output: types
 
 package types

diff --git a/signature/generator/rust/generated.txt b/signature/generator/rust/generated.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: types
 
 #![allow(dead_code)]

diff --git a/signature/generator/typescript/generated.txt b/signature/generator/typescript/generated.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature 0.4.3, DO NOT EDIT.
+// Code generated by scale-signature 0.4.4, DO NOT EDIT.
 // output: types
 
 import { Encoder, Decoder, Kind } from "@loopholelabs/polyglot"

diff --git a/storage/signature.go b/storage/signature.go
@@ -30,6 +30,7 @@ import (
 )
 
 const (
+	defaultVersion     = "v0.1.0"
 	SignatureDirectory = "signatures"
 )
 
@@ -311,10 +312,13 @@ func GenerateSignature(sig *signature.Schema, name string, tag string, org strin
 		Signature: sig,
 
 		GolangPackageImportPath: "signature",
-		GolangPackageVersion:    "v0.1.0",
+		GolangPackageVersion:    defaultVersion,
 
 		RustPackageName:    fmt.Sprintf("%s_%s_%s_guest", org, name, tag),
-		RustPackageVersion: "0.1.0",
+		RustPackageVersion: defaultVersion,
+
+		TypescriptPackageName:    fmt.Sprintf("%s-%s-%s-guest", org, name, tag),
+		TypescriptPackageVersion: defaultVersion,
 	})
 	if err != nil {
 		return err
@@ -335,9 +339,13 @@ func GenerateSignature(sig *signature.Schema, name string, tag string, org strin
 	}
 
 	hostPackage, err := generator.GenerateHostLocal(&generator.Options{
-		Signature:               sig,
+		Signature: sig,
+
 		GolangPackageImportPath: "signature",
-		GolangPackageVersion:    "v0.1.0",
+		GolangPackageVersion:    defaultVersion,
+
+		TypescriptPackageName:    fmt.Sprintf("%s-%s-%s-host", org, name, tag),
+		TypescriptPackageVersion: defaultVersion,
 	})
 	if err != nil {
 		return err

diff --git a/version/current_version b/version/current_version
@@ -1 +1 @@
-v0.4.3
+v0.4.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,5 @@ type Target int @@
     const (
     	WASITarget Target = iota
+    	WASMTarget
     )