Merge branch 'gear-tech:master' into ri/judge_async_methods_in_service_impl

Author: ridesun

.github/workflows/ci-js.yml

@@ -34,48 +34,33 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: "Install: pkg dependencies"
-        working-directory: js/sails
+      - name: "Install: dependencies"
         run: yarn install
 
       - name: "Install: binaryen"
+        working-directory: /usr
         run: |
           sudo wget -c https://github.com/WebAssembly/binaryen/releases/download/$BINARYEN_VERSION/binaryen-$BINARYEN_VERSION-x86_64-linux.tar.gz -O - | sudo tar -xz -C .
           sudo cp binaryen-$BINARYEN_VERSION/bin/wasm-opt /usr/bin/
 
-      - name: "Prepare: build parser"
-        run: |
-          cargo build -p sails-idl-parser --target=wasm32-unknown-unknown --release
-          wasm-opt -O4 -o ./js/sails/parser.wasm ./target/wasm32-unknown-unknown/release/sails_idl_parser.wasm
-
-      - name: "Prepare: build sails-js"
-        working-directory: js/sails
+      - name: "Prepare: build all"
         run: yarn build
 
-      - name: "Prepare: build demo app"
-        run: |
-          cargo build -p demo --release
+      - name: "Prepare: fmt"
+        run: yarn fmt
 
       - name: "Prepare: download Gear node"
         run: |
           wget -O ./gear https://github.com/gear-tech/gear/releases/download/build/gear
           chmod +x gear
 
       - name: "Prepare: run Gear node"
-        run: |
-          nohup ./gear --dev --execution=wasm --tmp --unsafe-rpc-external --rpc-methods Unsafe --rpc-cors all &
+        run: nohup ./gear --dev --execution=wasm --tmp --unsafe-rpc-external --rpc-methods Unsafe --rpc-cors all &
 
       - name: "Prepare: sleep 3 min"
         run: sleep 180
 
-      - name: "Prepare: generate ts lib"
-        working-directory: js/sails
-        run: |
-          node lib/app.js generate ../../examples/demo/client/demo.idl -o ./test/demo
-          node test/modify-import.js
-
       - name: "Test: run"
-        working-directory: js/sails
         run: yarn test
 
   publish-to-npm:
@@ -86,48 +71,27 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Check package version
-        uses: EndBug/version-check@v2
-        id: check
-        with:
-          file-name: js/sails/package.json
-          file-url: https://unpkg.com/sails-js@latest/package.json
-          static-checking: localIsNew
-
-      - name: Use node 18.x
-        if: steps.check.outputs.changed == 'true'
+      - name: Use node 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - name: "Prepare: install dependencies"
-        if: steps.check.outputs.changed == 'true'
-        working-directory: js/sails
         run: yarn install
 
       - name: "Install: binaryen"
-        if: steps.check.outputs.changed == 'true'
+        working-directory: /usr
         run: |
           sudo wget -c https://github.com/WebAssembly/binaryen/releases/download/$BINARYEN_VERSION/binaryen-$BINARYEN_VERSION-x86_64-linux.tar.gz -O - | sudo tar -xz -C .
           sudo cp binaryen-$BINARYEN_VERSION/bin/wasm-opt /usr/bin/
 
-      - name: "Prepare: build parser"
-        if: steps.check.outputs.changed == 'true'
-        run: |
-          cargo build -p sails-idl-parser --target=wasm32-unknown-unknown --release
-          wasm-opt -O4 -o ./js/sails/parser.wasm ./target/wasm32-unknown-unknown/release/sails_idl_parser.wasm
-
-      - name: "Prepare: build sails-js"
-        if: steps.check.outputs.changed == 'true'
-        working-directory: js/sails
+      - name: "Prepare: build all"
         run: yarn build
 
       - name: Publish
-        if: steps.check.outputs.changed == 'true'
-        working-directory: js/sails/lib
         run: |
           export token=$(printenv npm_token)
-          npm config set //registry.npmjs.org/:_authToken=$token
-          npm publish
+          echo "//registry.npmjs.org/:_authToken=$token" > .npmrc
+          npx lerna publish from-package --yes --no-private
         env:
           npm_token: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -7,8 +7,15 @@ target/
 
 # js
 node_modules/
-js/sails/lib/
-js/sails/parser.wasm
-js/sails/test/demo/
-js/sails/.yarn/*
-!js/sails/.yarn/releases
+js/**/lib/
+js/cli/build/
+js/parser/parser.wasm
+js/test/demo/
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+.npmrc

js/sails/.yarn/releases/yarn-4.4.1.cjs .yarn/releases/yarn-4.4.1.cjs

@@ -1,3 +1,2 @@
-nodeLinker: node-modules
-
 yarnPath: .yarn/releases/yarn-4.4.1.cjs
+nodeLinker: node-modules

js/sails/.yarnrc.yml .yarnrc.yml

@@ -58,7 +58,7 @@ git-download = "0.1"
 handlebars = "4.4"
 hashbrown = "0.14"
 hex = { version = "0.4", default-features = false }
-insta = "1.39"
+insta = "1.40"
 itertools = "0.13"
 lalrpop = { version = "0.20", default-features = false }
 lalrpop-util = "0.20"

Cargo.lock

@@ -1,5 +1,10 @@
 precommit: fmt clippy test
 
+precommit-js:
+	@yarn install
+	@yarn build
+	@yarn fmt
+
 fmt:
 	@__GEAR_WASM_BUILDER_NO_FEATURES_TRACKING=1 cargo fmt --all -- --check
 
@@ -13,7 +18,6 @@ build-parser:
 	@echo "Building idlparser"
 	@cargo build -p sails-idl-parser --target=wasm32-unknown-unknown --release
 	@ls -lah ./target/wasm32-unknown-unknown/release/sails_idl_parser.wasm
-	@cp ./target/wasm32-unknown-unknown/release/sails_idl_parser.wasm js/sails/parser.wasm
 	@cp ./target/wasm32-unknown-unknown/release/sails_idl_parser.wasm js/parser/parser.wasm
 
 build-proxy:
@@ -29,4 +33,4 @@ build-proxy-idl:
 
 build-js:
 	@echo "Building sails-js"
-	@cd js/sails && yarn build
+	yarn build

Cargo.toml

@@ -0,0 +1,17 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default [
+  { files: ['js/**/src/**/*.{ts}'] },
+  { languageOptions: { globals: { ...globals.browser, ...globals.node } } },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-this-alias': 'off',
+      'no-unexpected-multiline': 'off',
+    },
+  },
+];

Makefile

@@ -227,8 +227,9 @@ async fn counter_query_not_enough_gas() {
     assert!(matches!(
         result,
         Err(sails_rs::errors::Error::Rtl(RtlError::ReplyHasError(
-            ErrorReplyReason::Execution(SimpleExecutionError::RanOutOfGas)
-        )))
+            ErrorReplyReason::Execution(SimpleExecutionError::RanOutOfGas),
+            message
+        ))) if message == "Not enough gas to handle program data"
     ));
 }
 

eslint.config.mjs

@@ -139,8 +139,9 @@ async fn counter_query_not_enough_gas() {
     assert!(matches!(
         result,
         Err(sails_rs::errors::Error::Rtl(RtlError::ReplyHasError(
-            ErrorReplyReason::Execution(SimpleExecutionError::RanOutOfGas)
-        )))
+            ErrorReplyReason::Execution(SimpleExecutionError::RanOutOfGas),
+            message
+        ))) if message == "Not enough gas to handle program data"
     ));
 }