diff --git a/.pnp.cjs b/.pnp.cjs index 463481768..967537240 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -3726,15 +3726,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@syuilo/aiscript", [\ - ["npm:0.11.1", {\ - "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip/node_modules/@syuilo/aiscript/",\ + ["npm:0.16.0", {\ + "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip/node_modules/@syuilo/aiscript/",\ "packageDependencies": [\ - ["@syuilo/aiscript", "npm:0.11.1"],\ - ["autobind-decorator", "npm:2.4.0"],\ - ["chalk", "npm:4.0.0"],\ + ["@syuilo/aiscript", "npm:0.16.0"],\ ["seedrandom", "npm:3.0.5"],\ ["stringz", "npm:2.1.0"],\ - ["uuid", "npm:7.0.3"]\ + ["uuid", "npm:9.0.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -7154,7 +7152,6 @@ const RAW_RUNTIME_STATE = ["@swc/cli", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.1.62"],\ ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ ["@swc/core-android-arm64", "npm:1.3.11"],\ - ["@syuilo/aiscript", "npm:0.11.1"],\ ["@types/adm-zip", "npm:0.5.0"],\ ["@types/async-lock", "npm:1.4.0"],\ ["@types/bcryptjs", "npm:2.4.2"],\ @@ -8122,15 +8119,6 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["npm:4.0.0", {\ - "packageLocation": "./.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip/node_modules/chalk/",\ - "packageDependencies": [\ - ["chalk", "npm:4.0.0"],\ - ["ansi-styles", "npm:4.3.0"],\ - ["supports-color", "npm:7.2.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:4.1.2", {\ "packageLocation": "./.yarn/cache/chalk-npm-4.1.2-ba8b67ab80-cb3f3e5949.zip/node_modules/chalk/",\ "packageDependencies": [\ @@ -8524,7 +8512,7 @@ const RAW_RUNTIME_STATE = ["@rollup/plugin-alias", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ ["@rollup/plugin-json", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:6.0.1"],\ ["@rollup/pluginutils", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ - ["@syuilo/aiscript", "npm:0.11.1"],\ + ["@syuilo/aiscript", "npm:0.16.0"],\ ["@types/escape-regexp", "npm:0.0.1"],\ ["@types/glob", "npm:8.1.0"],\ ["@types/gulp", "npm:4.0.13"],\ @@ -24627,13 +24615,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["uuid", [\ - ["npm:7.0.3", {\ - "packageLocation": "./.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip/node_modules/uuid/",\ - "packageDependencies": [\ - ["uuid", "npm:7.0.3"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:8.0.0", {\ "packageLocation": "./.yarn/cache/uuid-npm-8.0.0-591e3a2e23-5086c43bbe.zip/node_modules/uuid/",\ "packageDependencies": [\ @@ -24654,6 +24635,13 @@ const RAW_RUNTIME_STATE = ["uuid", "npm:9.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:9.0.1", {\ + "packageLocation": "./.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip/node_modules/uuid/",\ + "packageDependencies": [\ + ["uuid", "npm:9.0.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["v8-compile-cache-lib", [\ diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip b/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip deleted file mode 100644 index 03a21f1a0..000000000 --- a/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fa9222eb49fe8cb2b23d2910c82afdfc4d37c3af1b0a01c636bf5e91e7a369c -size 46113 diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip b/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip new file mode 100644 index 000000000..b3ef0b306 --- /dev/null +++ b/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fb77fa49be7052b16c7a261da8f2a3ddaa933547c55760c8cde8e42403deac9 +size 181843 diff --git a/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip b/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip deleted file mode 100644 index be67166cf..000000000 --- a/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab2429f73cdef64b4e43ef9648f4288162a51bf399d60f5365b7d9c19334a44a -size 13166 diff --git a/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip b/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip deleted file mode 100644 index 0895e9662..000000000 --- a/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96655d1ba659598733dc27c4d783e48b20aff24182ee5ca08208484b1841767c -size 46227 diff --git a/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip b/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip new file mode 100644 index 000000000..196ca8b45 --- /dev/null +++ b/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74f080b144165817c0dbf45fc9cf659b170800964efaebf6f6b49dc8b0eb7018 +size 60894 diff --git a/packages/backend/package.json b/packages/backend/package.json index f0c858b47..797f8c21f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -35,7 +35,6 @@ "@peertube/http-signature": "1.7.0", "@redocly/openapi-core": "1.0.0-beta.131", "@sinonjs/fake-timers": "9.1.2", - "@syuilo/aiscript": "0.11.1", "adm-zip": "^0.5.10", "ajv": "8.12.0", "archiver": "5.3.1", diff --git a/packages/client/package.json b/packages/client/package.json index c519f5cd8..6ca7893eb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -17,7 +17,7 @@ "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-json": "^6.0.1", "@rollup/pluginutils": "^5.1.0", - "@syuilo/aiscript": "0.11.1", + "@syuilo/aiscript": "0.16.0", "@types/escape-regexp": "0.0.1", "@types/glob": "8.1.0", "@types/gulp": "4.0.13", diff --git a/packages/client/src/components/page/page.vue b/packages/client/src/components/page/page.vue index f2079c9ba..2ca4d8fd2 100644 --- a/packages/client/src/components/page/page.vue +++ b/packages/client/src/components/page/page.vue @@ -22,7 +22,7 @@ import { onUnmounted, PropType, } from "vue"; -import { parse } from "@syuilo/aiscript"; +import { Parser } from "@syuilo/aiscript"; import XBlock from "./page.block.vue"; import { Hpml } from "@/scripts/hpml/evaluator"; import { url } from "@/config"; @@ -47,12 +47,14 @@ export default defineComponent({ enableAiScript: !defaultStore.state.disablePagesScript, }); + const parser = new Parser(); + onMounted(() => { nextTick(() => { if (props.page.script && hpml.aiscript) { let ast; try { - ast = parse(props.page.script); + ast = parser.parse(props.page.script); } catch (err) { console.error(err); /*os.alert({ diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue index 77b4bf835..c6f2a23b3 100644 --- a/packages/client/src/pages/scratchpad.vue +++ b/packages/client/src/pages/scratchpad.vue @@ -45,7 +45,7 @@ import "prismjs/components/prism-javascript"; import "prismjs/themes/prism-okaidia.css"; import { PrismEditor } from "vue-prism-editor"; import "vue-prism-editor/dist/prismeditor.min.css"; -import { AiScript, parse, utils } from "@syuilo/aiscript"; +import { Interpreter, Parser, utils } from "@syuilo/aiscript"; import MkContainer from "@/components/MkContainer.vue"; import MkButton from "@/components/MkButton.vue"; import { createAiScriptEnv } from "@/scripts/aiscript/api"; @@ -57,6 +57,8 @@ import { definePageMetadata } from "@/scripts/page-metadata"; const code = ref(""); const logs = ref([]); +const parser = new Parser(); + const saved = localStorage.getItem("scratchpad"); if (saved) { code.value = saved; @@ -68,7 +70,7 @@ watch(code, () => { async function run() { logs.value = []; - const aiscript = new AiScript( + const aiscript = new Interpreter( createAiScriptEnv({ storageKey: "scratchpad", token: $i?.token, @@ -111,11 +113,11 @@ async function run() { let ast; try { - ast = parse(code.value); + ast = parser.parse(code.value); } catch (error) { os.alert({ type: "error", - text: "Syntax error :(", + text: `Syntax error : ${error}`, }); return; } diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue index a38c4a062..15af1db52 100644 --- a/packages/client/src/pages/settings/plugin.install.vue +++ b/packages/client/src/pages/settings/plugin.install.vue @@ -19,8 +19,7 @@ - - diff --git a/yarn.lock b/yarn.lock index ae98e6abf..5d6b335f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2691,16 +2691,14 @@ __metadata: languageName: node linkType: hard -"@syuilo/aiscript@npm:0.11.1": - version: 0.11.1 - resolution: "@syuilo/aiscript@npm:0.11.1" +"@syuilo/aiscript@npm:0.16.0": + version: 0.16.0 + resolution: "@syuilo/aiscript@npm:0.16.0" dependencies: - autobind-decorator: "npm:2.4.0" - chalk: "npm:4.0.0" seedrandom: "npm:3.0.5" stringz: "npm:2.1.0" - uuid: "npm:7.0.3" - checksum: 10/4df4bb5a25e8334dbfecac5dfa047b7637821d31daa1ada6fb14d2f13e94be4655c3845f6f61643be327b682608456d22fc5557c23c6c68bc1cfb7c76b6970d6 + uuid: "npm:9.0.1" + checksum: 10/5c77fc596dcff0e7ac30ba33f2550430dc1d69bd33075811d7822efb6102bae4169f455c867eac5821bee88993941bc6003bd981ad64885b2e643cb4bc260d4a languageName: node linkType: hard @@ -5463,7 +5461,6 @@ __metadata: "@swc/cli": "npm:^0.1.62" "@swc/core": "npm:^1.3.68" "@swc/core-android-arm64": "npm:1.3.11" - "@syuilo/aiscript": "npm:0.11.1" "@types/adm-zip": "npm:^0.5.0" "@types/async-lock": "npm:1.4.0" "@types/bcryptjs": "npm:2.4.2" @@ -6339,16 +6336,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.0.0": - version: 4.0.0 - resolution: "chalk@npm:4.0.0" - dependencies: - ansi-styles: "npm:^4.1.0" - supports-color: "npm:^7.1.0" - checksum: 10/f8ae363f43826f0eea96f94dbf5c544ec3cda1422ec998040b82381702db54e2a056a724445f6295842790bb7a3cb352cf83c704a4fdfee2bfcd2a74ce7fea13 - languageName: node - linkType: hard - "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -6673,7 +6660,7 @@ __metadata: "@rollup/plugin-alias": "npm:^5.1.0" "@rollup/plugin-json": "npm:^6.0.1" "@rollup/pluginutils": "npm:^5.1.0" - "@syuilo/aiscript": "npm:0.11.1" + "@syuilo/aiscript": "npm:0.16.0" "@types/escape-regexp": "npm:0.0.1" "@types/glob": "npm:8.1.0" "@types/gulp": "npm:4.0.13" @@ -20813,15 +20800,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:7.0.3": - version: 7.0.3 - resolution: "uuid@npm:7.0.3" - bin: - uuid: dist/bin/uuid - checksum: 10/b2a4d30ecd6581015175487426558aafd7f7b4013a2e30802c128cc28cad9abe46ecd36c02f7fbcde7908fd4672334818d56a441c0871963d6bd89d911bef2ea - languageName: node - linkType: hard - "uuid@npm:8.0.0": version: 8.0.0 resolution: "uuid@npm:8.0.0" @@ -20840,6 +20818,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:9.0.1": + version: 9.0.1 + resolution: "uuid@npm:9.0.1" + bin: + uuid: dist/bin/uuid + checksum: 10/9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2 + languageName: node + linkType: hard + "uuid@npm:^8.3.0, uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2"