summaryrefslogtreecommitdiff
path: root/packages/client/src/scripts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-09-18 03:27:08 +0900
committerGitHub <noreply@github.com>2022-09-18 03:27:08 +0900
commitb75184ec8e3436200bacdcd832e3324702553d20 (patch)
tree8b7e316f29e95df921db57289c8b8da476d18f07 /packages/client/src/scripts
parentUpdate ROADMAP.md (diff)
downloadsharkey-b75184ec8e3436200bacdcd832e3324702553d20.tar.gz
sharkey-b75184ec8e3436200bacdcd832e3324702553d20.tar.bz2
sharkey-b75184ec8e3436200bacdcd832e3324702553d20.zip
なんかもうめっちゃ変えた
Diffstat (limited to 'packages/client/src/scripts')
-rw-r--r--packages/client/src/scripts/aiscript/api.ts2
-rw-r--r--packages/client/src/scripts/hpml/type-checker.ts12
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/client/src/scripts/aiscript/api.ts b/packages/client/src/scripts/aiscript/api.ts
index 01b8fd05fe..6debcb8a13 100644
--- a/packages/client/src/scripts/aiscript/api.ts
+++ b/packages/client/src/scripts/aiscript/api.ts
@@ -27,7 +27,7 @@ export function createAiScriptEnv(opts) {
if (token) utils.assertString(token);
apiRequests++;
if (apiRequests > 16) return values.NULL;
- const res = await os.api(ep.value, utils.valToJs(param), token ? token.value : (opts.token || null));
+ const res = await os.api(ep.value, utils.valToJs(param), token ? token.value : (opts.token ?? null));
return utils.jsToVal(res);
}),
'Mk:save': values.FN_NATIVE(([key, value]) => {
diff --git a/packages/client/src/scripts/hpml/type-checker.ts b/packages/client/src/scripts/hpml/type-checker.ts
index 9633b3cd01..24c9ed8bcb 100644
--- a/packages/client/src/scripts/hpml/type-checker.ts
+++ b/packages/client/src/scripts/hpml/type-checker.ts
@@ -1,7 +1,9 @@
import autobind from 'autobind-decorator';
-import { Type, envVarsDef, PageVar } from '.';
-import { Expr, isLiteralValue, Variable } from './expr';
+import { isLiteralValue } from './expr';
import { funcDefs } from './lib';
+import { envVarsDef } from '.';
+import type { Type, PageVar } from '.';
+import type { Expr, Variable } from './expr';
type TypeError = {
arg: number;
@@ -44,14 +46,14 @@ export class HpmlTypeChecker {
return {
arg: i,
expect: generic[arg],
- actual: type
+ actual: type,
};
}
} else if (type !== arg) {
return {
arg: i,
expect: arg,
- actual: type
+ actual: type,
};
}
}
@@ -81,7 +83,7 @@ export class HpmlTypeChecker {
}
if (typeof def.in[slot] === 'number') {
- return generic[def.in[slot]] || null;
+ return generic[def.in[slot]] ?? null;
} else {
return def.in[slot];
}