diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-01 20:57:23 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-01 20:57:23 +0900 |
| commit | 6d35872af5d16b36f310f06ef10656ba71bf9712 (patch) | |
| tree | 20ea5434958ae52ac63d2b58528122e3f001c884 /src | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.8.0 (diff) | |
| download | misskey-6d35872af5d16b36f310f06ef10656ba71bf9712.tar.gz misskey-6d35872af5d16b36f310f06ef10656ba71bf9712.tar.bz2 misskey-6d35872af5d16b36f310f06ef10656ba71bf9712.zip | |
Merge branch 'develop'
Diffstat (limited to 'src')
26 files changed, 795 insertions, 576 deletions
diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts deleted file mode 100644 index 99caec8c15..0000000000 --- a/src/client/app/common/scripts/aiscript.ts +++ /dev/null @@ -1,487 +0,0 @@ -/** - * AiScript - * evaluator & type checker - */ - -import autobind from 'autobind-decorator'; -import * as seedrandom from 'seedrandom'; - -import { - faSuperscript, - faAlignLeft, - faShareAlt, - faSquareRootAlt, - faPlus, - faMinus, - faTimes, - faDivide, - faList, - faQuoteRight, - faEquals, - faGreaterThan, - faLessThan, - faGreaterThanEqual, - faLessThanEqual, - faExclamation, - faNotEqual, - faDice, - faSortNumericUp, - faExchangeAlt, -} from '@fortawesome/free-solid-svg-icons'; -import { faFlag } from '@fortawesome/free-regular-svg-icons'; - -import { version } from '../../config'; - -export type Block = { - id: string; - type: string; - args: Block[]; - value: any; -}; - -export type Variable = Block & { - name: string; -}; - -type Type = 'string' | 'number' | 'boolean' | 'stringArray'; - -type TypeError = { - arg: number; - expect: Type; - actual: Type; -}; - -const funcDefs = { - if: { in: ['boolean', 0, 0], out: 0, category: 'flow', icon: faShareAlt, }, - not: { in: ['boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, - or: { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, - and: { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, - add: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faPlus, }, - subtract: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faMinus, }, - multiply: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faTimes, }, - divide: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faDivide, }, - eq: { in: [0, 0], out: 'boolean', category: 'comparison', icon: faEquals, }, - notEq: { in: [0, 0], out: 'boolean', category: 'comparison', icon: faNotEqual, }, - gt: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faGreaterThan, }, - lt: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faLessThan, }, - gtEq: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faGreaterThanEqual, }, - ltEq: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faLessThanEqual, }, - strLen: { in: ['string'], out: 'number', category: 'text', icon: faQuoteRight, }, - strPick: { in: ['string', 'number'], out: 'string', category: 'text', icon: faQuoteRight, }, - strReplace: { in: ['string', 'string', 'string'], out: 'string', category: 'text', icon: faQuoteRight, }, - strReverse: { in: ['string'], out: 'string', category: 'text', icon: faQuoteRight, }, - stringToNumber: { in: ['string'], out: 'number', category: 'convert', icon: faExchangeAlt, }, - numberToString: { in: ['number'], out: 'string', category: 'convert', icon: faExchangeAlt, }, - rannum: { in: ['number', 'number'], out: 'number', category: 'random', icon: faDice, }, - dailyRannum: { in: ['number', 'number'], out: 'number', category: 'random', icon: faDice, }, - random: { in: ['number'], out: 'boolean', category: 'random', icon: faDice, }, - dailyRandom: { in: ['number'], out: 'boolean', category: 'random', icon: faDice, }, - randomPick: { in: [0], out: 0, category: 'random', icon: faDice, }, - dailyRandomPick: { in: [0], out: 0, category: 'random', icon: faDice, }, -}; - -const blockDefs = [ - { type: 'text', out: 'string', category: 'value', icon: faQuoteRight, }, - { type: 'multiLineText', out: 'string', category: 'value', icon: faAlignLeft, }, - { type: 'textList', out: 'stringArray', category: 'value', icon: faList, }, - { type: 'number', out: 'number', category: 'value', icon: faSortNumericUp, }, - { type: 'ref', out: null, category: 'value', icon: faSuperscript, }, - { type: 'in', out: null, category: 'value', icon: faSuperscript, }, - { type: 'fn', out: 'function', category: 'value', icon: faSuperscript, }, - ...Object.entries(funcDefs).map(([k, v]) => ({ - type: k, out: v.out || null, category: v.category, icon: v.icon - })) -]; - -type PageVar = { name: string; value: any; type: Type; }; - -const envVarsDef = { - AI: 'string', - URL: 'string', - VERSION: 'string', - LOGIN: 'boolean', - NAME: 'string', - USERNAME: 'string', - USERID: 'string', - NOTES_COUNT: 'number', - FOLLOWERS_COUNT: 'number', - FOLLOWING_COUNT: 'number', - IS_CAT: 'boolean', - MY_NOTES_COUNT: 'number', - MY_FOLLOWERS_COUNT: 'number', - MY_FOLLOWING_COUNT: 'number', -}; - -export class AiScript { - private variables: Variable[]; - private pageVars: PageVar[]; - private envVars: Record<keyof typeof envVarsDef, any>; - - public static envVarsDef = envVarsDef; - public static blockDefs = blockDefs; - public static funcDefs = funcDefs; - private opts: { - randomSeed?: string; user?: any; visitor?: any; page?: any; url?: string; - }; - - constructor(variables: Variable[] = [], pageVars: PageVar[] = [], opts: AiScript['opts'] = {}) { - this.variables = variables; - this.pageVars = pageVars; - this.opts = opts; - - this.envVars = { - AI: 'kawaii', - VERSION: version, - URL: opts.page ? `${opts.url}/@${opts.page.user.username}/pages/${opts.page.name}` : '', - LOGIN: opts.visitor != null, - NAME: opts.visitor ? opts.visitor.name : '', - USERNAME: opts.visitor ? opts.visitor.username : '', - USERID: opts.visitor ? opts.visitor.id : '', - NOTES_COUNT: opts.visitor ? opts.visitor.notesCount : 0, - FOLLOWERS_COUNT: opts.visitor ? opts.visitor.followersCount : 0, - FOLLOWING_COUNT: opts.visitor ? opts.visitor.followingCount : 0, - IS_CAT: opts.visitor ? opts.visitor.isCat : false, - MY_NOTES_COUNT: opts.user ? opts.user.notesCount : 0, - MY_FOLLOWERS_COUNT: opts.user ? opts.user.followersCount : 0, - MY_FOLLOWING_COUNT: opts.user ? opts.user.followingCount : 0, - }; - } - - @autobind - public injectVars(vars: Variable[]) { - this.variables = vars; - } - - @autobind - public injectPageVars(pageVars: PageVar[]) { - this.pageVars = pageVars; - } - - @autobind - public updatePageVar(name: string, value: any) { - this.pageVars.find(v => v.name === name).value = value; - } - - @autobind - public updateRandomSeed(seed: string) { - this.opts.randomSeed = seed; - } - - @autobind - public static isLiteralBlock(v: Block) { - if (v.type === null) return true; - if (v.type === 'text') return true; - if (v.type === 'multiLineText') return true; - if (v.type === 'textList') return true; - if (v.type === 'number') return true; - if (v.type === 'ref') return true; - if (v.type === 'fn') return true; - if (v.type === 'in') return true; - return false; - } - - @autobind - public typeCheck(v: Block): TypeError | null { - if (AiScript.isLiteralBlock(v)) return null; - - const def = AiScript.funcDefs[v.type]; - if (def == null) { - throw new Error('Unknown type: ' + v.type); - } - - const generic: Type[] = []; - - for (let i = 0; i < def.in.length; i++) { - const arg = def.in[i]; - const type = this.typeInference(v.args[i]); - if (type === null) continue; - - if (typeof arg === 'number') { - if (generic[arg] === undefined) { - generic[arg] = type; - } else if (type !== generic[arg]) { - return { - arg: i, - expect: generic[arg], - actual: type - }; - } - } else if (type !== arg) { - return { - arg: i, - expect: arg, - actual: type - }; - } - } - - return null; - } - - @autobind - public getExpectedType(v: Block, slot: number): Type | null { - const def = AiScript.funcDefs[v.type]; - if (def == null) { - throw new Error('Unknown type: ' + v.type); - } - - const generic: Type[] = []; - - for (let i = 0; i < def.in.length; i++) { - const arg = def.in[i]; - const type = this.typeInference(v.args[i]); - if (type === null) continue; - - if (typeof arg === 'number') { - if (generic[arg] === undefined) { - generic[arg] = type; - } - } - } - - if (typeof def.in[slot] === 'number') { - return generic[def.in[slot]] || null; - } else { - return def.in[slot]; - } - } - - @autobind - public typeInference(v: Block): Type | null { - if (v.type === null) return null; - if (v.type === 'text') return 'string'; - if (v.type === 'multiLineText') return 'string'; - if (v.type === 'textList') return 'stringArray'; - if (v.type === 'number') return 'number'; - if (v.type === 'ref') { - const variable = this.variables.find(va => va.name === v.value); - if (variable) { - return this.typeInference(variable); - } - - const pageVar = this.pageVars.find(va => va.name === v.value); - if (pageVar) { - return pageVar.type; - } - - const envVar = AiScript.envVarsDef[v.value]; - if (envVar) { - return envVar; - } - - return null; - } - if (v.type === 'fn') return null; // todo - if (v.type === 'in') return null; // todo - - const generic: Type[] = []; - - const def = AiScript.funcDefs[v.type]; - - for (let i = 0; i < def.in.length; i++) { - const arg = def.in[i]; - if (typeof arg === 'number') { - const type = this.typeInference(v.args[i]); - - if (generic[arg] === undefined) { - generic[arg] = type; - } else { - if (type !== generic[arg]) { - generic[arg] = null; - } - } - } - } - - if (typeof def.out === 'number') { - return generic[def.out]; - } else { - return def.out; - } - } - - @autobind - public getVarsByType(type: Type | null): Variable[] { - if (type == null) return this.variables; - return this.variables.filter(x => (this.typeInference(x) === null) || (this.typeInference(x) === type)); - } - - @autobind - public getVarByName(name: string): Variable { - return this.variables.find(x => x.name === name); - } - - @autobind - public getEnvVarsByType(type: Type | null): string[] { - if (type == null) return Object.keys(AiScript.envVarsDef); - return Object.entries(AiScript.envVarsDef).filter(([k, v]) => type === v).map(([k, v]) => k); - } - - @autobind - public getPageVarsByType(type: Type | null): string[] { - if (type == null) return this.pageVars.map(v => v.name); - return this.pageVars.filter(v => type === v.type).map(v => v.name); - } - - @autobind - private interpolate(str: string, values: { name: string, value: any }[]) { - return str.replace(/\{(.+?)\}/g, match => { - const v = this.getVariableValue(match.slice(1, -1).trim(), values); - return v == null ? 'NULL' : v.toString(); - }); - } - - @autobind - public evaluateVars() { - const values: { name: string, value: any }[] = []; - - for (const v of this.variables) { - values.push({ - name: v.name, - value: this.evaluate(v, values) - }); - } - - for (const v of this.pageVars) { - values.push({ - name: v.name, - value: v.value - }); - } - - for (const [k, v] of Object.entries(this.envVars)) { - values.push({ - name: k, - value: v - }); - } - - return values; - } - - @autobind - private evaluate(block: Block, values: { name: string, value: any }[], slotArg: Record<string, any> = {}): any { - if (block.type === null) { - return null; - } - - if (block.type === 'number') { - return parseInt(block.value, 10); - } - - if (block.type === 'text' || block.type === 'multiLineText') { - return this.interpolate(block.value, values); - } - - if (block.type === 'textList') { - return block.value.trim().split('\n'); - } - - if (block.type === 'ref') { - return this.getVariableValue(block.value, values); - } - - if (block.type === 'in') { - return slotArg[block.value]; - } - - if (block.type === 'fn') { // ユーザー関数定義 - return { - slots: block.value.slots, - exec: slotArg => this.evaluate(block.value.expression, values, slotArg) - }; - } - - if (block.type.startsWith('fn:')) { // ユーザー関数呼び出し - const fnName = block.type.split(':')[1]; - const fn = this.getVariableValue(fnName, values); - for (let i = 0; i < fn.slots.length; i++) { - const name = fn.slots[i]; - slotArg[name] = this.evaluate(block.args[i], values); - } - return fn.exec(slotArg); - } - - if (block.args === undefined) return null; - - const date = new Date(); - const day = `${this.opts.visitor ? this.opts.visitor.id : ''} ${date.getFullYear()}/${date.getMonth()}/${date.getDate()}`; - - const funcs: { [p in keyof typeof funcDefs]: any } = { - not: (a) => !a, - eq: (a, b) => a === b, - notEq: (a, b) => a !== b, - gt: (a, b) => a > b, - lt: (a, b) => a < b, - gtEq: (a, b) => a >= b, - ltEq: (a, b) => a <= b, - or: (a, b) => a || b, - and: (a, b) => a && b, - if: (bool, a, b) => bool ? a : b, - add: (a, b) => a + b, - subtract: (a, b) => a - b, - multiply: (a, b) => a * b, - divide: (a, b) => a / b, - strLen: (a) => a.length, - strPick: (a, b) => a[b - 1], - strReplace: (a, b, c) => a.split(b).join(c), - strReverse: (a) => a.split('').reverse().join(''), - stringToNumber: (a) => parseInt(a), - numberToString: (a) => a.toString(), - random: (probability) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability, - rannum: (min, max) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)), - randomPick: (list) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)], - dailyRandom: (probability) => Math.floor(seedrandom(`${day}:${block.id}`)() * 100) < probability, - dailyRannum: (min, max) => min + Math.floor(seedrandom(`${day}:${block.id}`)() * (max - min + 1)), - dailyRandomPick: (list) => list[Math.floor(seedrandom(`${day}:${block.id}`)() * list.length)], - }; - - const fnName = block.type; - - const fn = funcs[fnName]; - if (fn == null) { - console.error('Unknown function: ' + fnName); - throw new Error('Unknown function: ' + fnName); - } - - const args = block.args.map(x => this.evaluate(x, values, slotArg)); - - return fn(...args); - } - - @autobind - private getVariableValue(name: string, values: { name: string, value: any }[]): any { - const v = values.find(v => v.name === name); - if (v) { - return v.value; - } - - const pageVar = this.pageVars.find(v => v.name === name); - if (pageVar) { - return pageVar.value; - } - - if (AiScript.envVarsDef[name]) { - return this.envVars[name]; - } - - throw new Error(`Script: No such variable '${name}'`); - } - - @autobind - public isUsedName(name: string) { - if (this.variables.some(v => v.name === name)) { - return true; - } - - if (this.pageVars.some(v => v.name === name)) { - return true; - } - - if (AiScript.envVarsDef[name]) { - return true; - } - - return false; - } -} diff --git a/src/client/app/common/scripts/collect-page-vars.ts b/src/client/app/common/scripts/collect-page-vars.ts index 92727ce6db..683f9b73a5 100644 --- a/src/client/app/common/scripts/collect-page-vars.ts +++ b/src/client/app/common/scripts/collect-page-vars.ts @@ -6,25 +6,25 @@ export function collectPageVars(content) { pageVars.push({ name: x.name, type: 'string', - value: x.default + value: x.default || '' }); } else if (x.type === 'textareaInput') { pageVars.push({ name: x.name, type: 'string', - value: x.default + value: x.default || '' }); } else if (x.type === 'numberInput') { pageVars.push({ name: x.name, type: 'number', - value: x.default + value: x.default || 0 }); } else if (x.type === 'switch') { pageVars.push({ name: x.name, type: 'boolean', - value: x.default + value: x.default || false }); } else if (x.children) { collect(x.children); diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue b/src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue index aff6cf6b6b..923f4ea339 100644 --- a/src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue +++ b/src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue @@ -3,7 +3,7 @@ <template #header><fa :icon="faBolt"/> {{ $t('blocks.numberInput') }}</template> <section style="padding: 0 16px 0 16px;"> - <ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._numberInput.name') }}</span></ui-input> + <ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._numberInput.name') }}</span></ui-input> <ui-input v-model="value.text"><span>{{ $t('blocks._numberInput.text') }}</span></ui-input> <ui-input v-model="value.default" type="number"><span>{{ $t('blocks._numberInput.default') }}</span></ui-input> </section> @@ -12,7 +12,7 @@ <script lang="ts"> import Vue from 'vue'; -import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; +import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons'; import i18n from '../../../../../i18n'; import XContainer from '../page-editor.container.vue'; @@ -31,7 +31,7 @@ export default Vue.extend({ data() { return { - faBolt, faSquareRootAlt + faBolt, faMagic }; }, diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue b/src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue index 3404404d99..60d102f8ae 100644 --- a/src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue +++ b/src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue @@ -3,7 +3,7 @@ <template #header><fa :icon="faBolt"/> {{ $t('blocks.switch') }}</template> <section class="kjuadyyj"> - <ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._switch.name') }}</span></ui-input> + <ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._switch.name') }}</span></ui-input> <ui-input v-model="value.text"><span>{{ $t('blocks._switch.text') }}</span></ui-input> <ui-switch v-model="value.default"><span>{{ $t('blocks._switch.default') }}</span></ui-switch> </section> @@ -12,7 +12,7 @@ <script lang="ts"> import Vue from 'vue'; -import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; +import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons'; import i18n from '../../../../../i18n'; import XContainer from '../page-editor.container.vue'; @@ -31,7 +31,7 @@ export default Vue.extend({ data() { return { - faBolt, faSquareRootAlt + faBolt, faMagic }; }, diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue b/src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue index 6c4783fd7e..168a58f349 100644 --- a/src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue +++ b/src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue @@ -3,7 +3,7 @@ <template #header><fa :icon="faBolt"/> {{ $t('blocks.textInput') }}</template> <section style="padding: 0 16px 0 16px;"> - <ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._textInput.name') }}</span></ui-input> + <ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._textInput.name') }}</span></ui-input> <ui-input v-model="value.text"><span>{{ $t('blocks._textInput.text') }}</span></ui-input> <ui-input v-model="value.default" type="text"><span>{{ $t('blocks._textInput.default') }}</span></ui-input> </section> @@ -12,7 +12,7 @@ <script lang="ts"> import Vue from 'vue'; -import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; +import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons'; import i18n from '../../../../../i18n'; import XContainer from '../page-editor.container.vue'; @@ -31,7 +31,7 @@ export default Vue.extend({ data() { return { - faBolt, faSquareRootAlt + faBolt, faMagic }; }, diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue b/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue index 68edf13824..4b6d334d9b 100644 --- a/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue +++ b/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue @@ -3,7 +3,7 @@ <template #header><fa :icon="faBolt"/> {{ $t('blocks.textareaInput') }}</template> <section style="padding: 0 16px 16px 16px;"> - <ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._textareaInput.name') }}</span></ui-input> + <ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._textareaInput.name') }}</span></ui-input> <ui-input v-model="value.text"><span>{{ $t('blocks._textareaInput.text') }}</span></ui-input> <ui-textarea v-model="value.default"><span>{{ $t('blocks._textareaInput.default') }}</span></ui-textarea> </section> @@ -12,7 +12,7 @@ <script lang="ts"> import Vue from 'vue'; -import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; +import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons'; import i18n from '../../../../../i18n'; import XContainer from '../page-editor.container.vue'; @@ -31,7 +31,7 @@ export default Vue.extend({ data() { return { - faBolt, faSquareRootAlt + faBolt, faMagic }; }, diff --git a/src/client/app/common/views/components/page-editor/page-editor.script-block.vue b/src/client/app/common/views/components/page-editor/page-editor.script-block.vue index 9554c75d04..41ca8ed09a 100644 --- a/src/client/app/common/views/components/page-editor/page-editor.script-block.vue +++ b/src/client/app/common/views/components/page-editor/page-editor.script-block.vue @@ -25,6 +25,9 @@ <section v-else-if="value.type === 'ref'" class="hpdwcrvs"> <select v-model="value.value"> <option v-for="v in aiScript.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option> + <optgroup :label="$t('script.argVariables')"> + <option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option> + </optgroup> <optgroup :label="$t('script.pageVariables')"> <option v-for="v in aiScript.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option> </optgroup> @@ -33,17 +36,15 @@ </optgroup> </select> </section> - <section v-else-if="value.type === 'in'" class="hpdwcrvs"> - <select v-model="value.value"> - <option v-for="v in fnSlots" :value="v">{{ v }}</option> - </select> - </section> - <section v-else-if="value.type === 'fn'" class="" style="padding:16px;"> - <ui-textarea v-model="slots"></ui-textarea> + <section v-else-if="value.type === 'fn'" class="" style="padding:0 16px 16px 16px;"> + <ui-textarea v-model="slots"> + <span>{{ $t('script.blocks._fn.slots') }}</span> + <template #desc>{{ $t('script.blocks._fn.slots-info') }}</template> + </ui-textarea> <x-v v-if="value.value.expression" v-model="value.value.expression" :title="$t(`script.blocks._fn.arg1`)" :get-expected-type="() => null" :ai-script="aiScript" :fn-slots="value.value.slots" :name="name"/> </section> <section v-else-if="value.type.startsWith('fn:')" class="" style="padding:16px;"> - <x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="aiScript.getVarByName(value.type.split(':')[1]).value.slots[i]" :get-expected-type="() => null" :ai-script="aiScript" :name="name" :key="i"/> + <x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="aiScript.getVarByName(value.type.split(':')[1]).value.slots[i].name" :get-expected-type="() => null" :ai-script="aiScript" :name="name" :key="i"/> </section> <section v-else class="" style="padding:16px;"> <x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="$t(`script.blocks._${value.type}.arg${i + 1}`)" :get-expected-type="() => _getExpectedType(i)" :ai-script="aiScript" :name="name" :fn-slots="fnSlots" :key="i"/> @@ -55,8 +56,8 @@ import Vue from 'vue'; import i18n from '../../../../i18n'; import XContainer from './page-editor.container.vue'; -import { faSuperscript, faPencilAlt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; -import { AiScript } from '../../../scripts/aiscript'; +import { faPencilAlt, faPlug } from '@fortawesome/free-solid-svg-icons'; +import { isLiteralBlock, funcDefs, blockDefs } from '../../../../../../misc/aiscript/index'; import * as uuid from 'uuid'; export default Vue.extend({ @@ -96,29 +97,32 @@ export default Vue.extend({ data() { return { - AiScript, error: null, warn: null, slots: '', - faSuperscript, faPencilAlt, faSquareRootAlt + faPencilAlt }; }, computed: { icon(): any { if (this.value.type === null) return null; - if (this.value.type.startsWith('fn:')) return null; - return AiScript.blockDefs.find(x => x.type === this.value.type).icon; + if (this.value.type.startsWith('fn:')) return faPlug; + return blockDefs.find(x => x.type === this.value.type).icon; }, typeText(): any { if (this.value.type === null) return null; + if (this.value.type.startsWith('fn:')) return this.value.type.split(':')[1]; return this.$t(`script.blocks.${this.value.type}`); }, }, watch: { slots() { - this.value.value.slots = this.slots.split('\n'); + this.value.value.slots = this.slots.split('\n').map(x => ({ + name: x, + type: null + })); } }, @@ -129,7 +133,7 @@ export default Vue.extend({ created() { if (this.value.value == null) Vue.set(this.value, 'value', null); - if (this.value.value && this.value.value.slots) this.slots = this.value.value.slots.join('\n'); + if (this.value.value && this.value.value.slots) this.slots = this.value.value.slots.map(x => x.name).join('\n'); this.$watch('value.type', (t) => { this.warn = null; @@ -155,17 +159,17 @@ export default Vue.extend({ return; } - if (AiScript.isLiteralBlock(this.value)) return; + if (isLiteralBlock(this.value)) return; const empties = []; - for (let i = 0; i < AiScript.funcDefs[this.value.type].in.length; i++) { + for (let i = 0; i < funcDefs[this.value.type].in.length; i++) { const id = uuid.v4(); empties.push({ id, type: null }); } Vue.set(this.value, 'args', empties); - for (let i = 0; i < AiScript.funcDefs[this.value.type].in.length; i++) { - const inType = AiScript.funcDefs[this.value.type].in[i]; + for (let i = 0; i < funcDefs[this.value.type].in.length; i++) { + const inType = funcDefs[this.value.type].in[i]; if (typeof inType !== 'number') { if (inType === 'number') this.value.args[i].type = 'number'; if (inType === 'string') this.value.args[i].type = 'text'; diff --git a/src/client/app/common/views/components/page-editor/page-editor.vue b/src/client/app/common/views/components/page-editor/page-editor.vue index f8959fb0f1..6d07c5dc6b 100644 --- a/src/client/app/common/views/components/page-editor/page-editor.vue +++ b/src/client/app/common/views/components/page-editor/page-editor.vue @@ -36,10 +36,10 @@ </ui-select> <div class="eyeCatch"> - <ui-button v-if="eyeCatchingImageId == null" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button> + <ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button> <div v-else-if="eyeCatchingImage"> <img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name"/> - <ui-button @click="removeEyeCatchingImage()"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catchig-image') }}</ui-button> + <ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catchig-image') }}</ui-button> </div> </div> </template> @@ -53,7 +53,7 @@ </div> <ui-container :body-togglable="true"> - <template #header><fa :icon="faSquareRootAlt"/> {{ $t('variables') }}</template> + <template #header><fa :icon="faMagic"/> {{ $t('variables') }}</template> <div class="qmuvgica"> <div class="variables" v-show="variables.length > 0"> <template v-for="variable in variables"> @@ -77,21 +77,31 @@ <template v-if="moreDetails"> <ui-info><span v-html="$t('variables-info2')"></span></ui-info> <ui-info><span v-html="$t('variables-info3')"></span></ui-info> + <ui-info><span v-html="$t('variables-info4')"></span></ui-info> </template> </div> </ui-container> + + <ui-container :body-togglable="true" :expanded="false"> + <template #header><fa :icon="faCode"/> {{ $t('inspector') }}</template> + <div style="padding:0 32px 32px 32px;"> + <ui-textarea :value="JSON.stringify(content, null, 2)" readonly tall>{{ $t('content') }}</ui-textarea> + <ui-textarea :value="JSON.stringify(variables, null, 2)" readonly tall>{{ $t('variables') }}</ui-textarea> + </div> + </ui-container> </div> </template> <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../../i18n'; -import { faICursor, faPlus, faSquareRootAlt, faCog, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; +import { faICursor, faPlus, faMagic, faCog, faCode, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons'; +import i18n from '../../../../i18n'; import XVariable from './page-editor.script-block.vue'; import XBlock from './page-editor.block.vue'; import * as uuid from 'uuid'; -import { AiScript } from '../../../scripts/aiscript'; +import { blockDefs } from '../../../../../../misc/aiscript/index'; +import { ASTypeChecker } from '../../../../../../misc/aiscript/type-checker'; import { url } from '../../../../config'; import { collectPageVars } from '../../../scripts/collect-page-vars'; @@ -104,7 +114,7 @@ export default Vue.extend({ props: { page: { - type: String, + type: Object, required: false }, readonly: { @@ -132,7 +142,7 @@ export default Vue.extend({ showOptions: false, moreDetails: false, url, - faPlus, faICursor, faSave, faStickyNote, faSquareRootAlt, faCog, faTrashAlt, faExternalLinkSquareAlt + faPlus, faICursor, faSave, faStickyNote, faMagic, faCog, faTrashAlt, faExternalLinkSquareAlt, faCode }; }, @@ -149,32 +159,28 @@ export default Vue.extend({ }, created() { - this.aiScript = new AiScript(); + this.aiScript = new ASTypeChecker(); this.$watch('variables', () => { - this.aiScript.injectVars(this.variables); + this.aiScript.variables = this.variables; }, { deep: true }); this.$watch('content', () => { - this.aiScript.injectPageVars(collectPageVars(this.content)); + this.aiScript.pageVars = collectPageVars(this.content); }, { deep: true }); if (this.page) { - this.$root.api('pages/show', { - pageId: this.page, - }).then(page => { - this.author = page.user; - this.pageId = page.id; - this.title = page.title; - this.name = page.name; - this.currentName = page.name; - this.summary = page.summary; - this.font = page.font; - this.alignCenter = page.alignCenter; - this.content = page.content; - this.variables = page.variables; - this.eyeCatchingImageId = page.eyeCatchingImageId; - }); + this.author = this.page.user; + this.pageId = this.page.id; + this.title = this.page.title; + this.name = this.page.name; + this.currentName = this.page.name; + this.summary = this.page.summary; + this.font = this.page.font; + this.alignCenter = this.page.alignCenter; + this.content = this.page.content; + this.variables = this.page.variables; + this.eyeCatchingImageId = this.page.eyeCatchingImageId; } else { const id = uuid.v4(); this.content = [{ @@ -351,7 +357,7 @@ export default Vue.extend({ getScriptBlockList(type: string = null) { const list = []; - const blocks = AiScript.blockDefs.filter(block => type === null || block.out === null || block.out === type); + const blocks = blockDefs.filter(block => type === null || block.out === null || block.out === type); for (const block of blocks) { const category = list.find(x => x.category === block.category); diff --git a/src/client/app/common/views/pages/page/page.button.vue b/src/client/app/common/views/pages/page/page.button.vue index b77d856d5d..3747be96ce 100644 --- a/src/client/app/common/views/pages/page/page.button.vue +++ b/src/client/app/common/views/pages/page/page.button.vue @@ -20,13 +20,13 @@ export default Vue.extend({ methods: { click() { if (this.value.action === 'dialog') { - this.script.reEval(); + this.script.eval(); this.$root.dialog({ text: this.script.interpolate(this.value.content) }); } else if (this.value.action === 'resetRandom') { this.script.aiScript.updateRandomSeed(Math.random()); - this.script.reEval(); + this.script.eval(); } } } diff --git a/src/client/app/common/views/pages/page/page.if.vue b/src/client/app/common/views/pages/page/page.if.vue index 9dbeaf64fb..417ef0c553 100644 --- a/src/client/app/common/views/pages/page/page.if.vue +++ b/src/client/app/common/views/pages/page/page.if.vue @@ -1,5 +1,5 @@ <template> -<div v-show="script.vars.find(x => x.name === value.var).value"> +<div v-show="script.vars[value.var]"> <x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h"/> </div> </template> diff --git a/src/client/app/common/views/pages/page/page.number-input.vue b/src/client/app/common/views/pages/page/page.number-input.vue index 51d538c369..31da37330a 100644 --- a/src/client/app/common/views/pages/page/page.number-input.vue +++ b/src/client/app/common/views/pages/page/page.number-input.vue @@ -26,7 +26,7 @@ export default Vue.extend({ watch: { v() { this.script.aiScript.updatePageVar(this.value.name, this.v); - this.script.reEval(); + this.script.eval(); } } }); diff --git a/src/client/app/common/views/pages/page/page.switch.vue b/src/client/app/common/views/pages/page/page.switch.vue index a401e5dfbf..53695f1b36 100644 --- a/src/client/app/common/views/pages/page/page.switch.vue +++ b/src/client/app/common/views/pages/page/page.switch.vue @@ -26,7 +26,7 @@ export default Vue.extend({ watch: { v() { this.script.aiScript.updatePageVar(this.value.name, this.v); - this.script.reEval(); + this.script.eval(); } } }); diff --git a/src/client/app/common/views/pages/page/page.text-input.vue b/src/client/app/common/views/pages/page/page.text-input.vue index 3d659edd5e..cf917dd5a8 100644 --- a/src/client/app/common/views/pages/page/page.text-input.vue +++ b/src/client/app/common/views/pages/page/page.text-input.vue @@ -26,7 +26,7 @@ export default Vue.extend({ watch: { v() { this.script.aiScript.updatePageVar(this.value.name, this.v); - this.script.reEval(); + this.script.eval(); } } }); diff --git a/src/client/app/common/views/pages/page/page.textarea-input.vue b/src/client/app/common/views/pages/page/page.textarea-input.vue index fd8174c273..eece59fefb 100644 --- a/src/client/app/common/views/pages/page/page.textarea-input.vue +++ b/src/client/app/common/views/pages/page/page.textarea-input.vue @@ -26,7 +26,7 @@ export default Vue.extend({ watch: { v() { this.script.aiScript.updatePageVar(this.value.name, this.v); - this.script.reEval(); + this.script.eval(); } } }); diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 88598d3527..29853f95b8 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -11,6 +11,7 @@ <footer> <small>@{{ page.user.username }}</small> <router-link v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId" :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link> + <router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link> </footer> </div> </template> @@ -18,30 +19,36 @@ <script lang="ts"> import Vue from 'vue'; import i18n from '../../../../i18n'; -import { faICursor, faPlus, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons'; +import { faICursor, faPlus } from '@fortawesome/free-solid-svg-icons'; import { faSave, faStickyNote } from '@fortawesome/free-regular-svg-icons'; import XBlock from './page.block.vue'; -import { AiScript } from '../../../scripts/aiscript'; +import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator'; import { collectPageVars } from '../../../scripts/collect-page-vars'; import { url } from '../../../../config'; class Script { - public aiScript: AiScript; - public vars: any; + public aiScript: ASEvaluator; + private onError: any; + public vars: Record<string, any>; - constructor(aiScript) { + constructor(aiScript, onError) { this.aiScript = aiScript; - this.vars = this.aiScript.evaluateVars(); + this.onError = onError; + this.eval(); } - public reEval() { - this.vars = this.aiScript.evaluateVars(); + public eval() { + try { + this.vars = this.aiScript.evaluateVars(); + } catch (e) { + this.onError(e); + } } public interpolate(str: string) { if (str == null) return null; return str.replace(/\{(.+?)\}/g, match => { - const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value; + const v = this.vars[match.slice(1, -1).trim()]; return v == null ? 'NULL' : v.toString(); }); } @@ -69,7 +76,7 @@ export default Vue.extend({ return { page: null, script: null, - faPlus, faICursor, faSave, faStickyNote, faSquareRootAlt + faPlus, faICursor, faSave, faStickyNote }; }, @@ -80,13 +87,15 @@ export default Vue.extend({ }).then(page => { this.page = page; const pageVars = this.getPageVars(); - this.script = new Script(new AiScript(this.page.variables, pageVars, { + this.script = new Script(new ASEvaluator(this.page.variables, pageVars, { randomSeed: Math.random(), user: page.user, visitor: this.$store.state.i, page: page, url: url - })); + }), e => { + console.dir(e); + }); }); }, @@ -146,4 +155,10 @@ export default Vue.extend({ display block opacity 0.5 + > a + font-size 14px + + > a + a + margin-left 8px + </style> diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 00ba5db23a..e8da235263 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -159,8 +159,9 @@ init(async (launch, os) => { { path: '/i/pages', component: () => import('./views/home/pages.vue').then(m => m.default) }, ]}, { path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) }, + { path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, { path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, - { path: '/i/pages/edit/:page', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, + { path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, { path: '/i/messaging/:user', component: MkMessagingRoom }, { path: '/i/drive', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive }, diff --git a/src/client/app/desktop/views/pages/page-editor.vue b/src/client/app/desktop/views/pages/page-editor.vue index 50d1e7db61..35b4008e4f 100644 --- a/src/client/app/desktop/views/pages/page-editor.vue +++ b/src/client/app/desktop/views/pages/page-editor.vue @@ -1,7 +1,7 @@ <template> <mk-ui> <main> - <x-page-editor :page="page"/> + <x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/> </main> </mk-ui> </template> @@ -15,9 +15,44 @@ export default Vue.extend({ }, props: { - page: { + pageId: { type: String, required: false + }, + pageName: { + type: String, + required: false + }, + user: { + type: String, + required: false + } + }, + + data() { + return { + page: undefined, + readonly: false + }; + }, + + created() { + if (this.pageId) { + this.$root.api('pages/show', { + pageId: this.pageId, + }).then(page => { + this.page = page; + }); + } else if (this.pageName && this.user) { + this.$root.api('pages/show', { + name: this.pageName, + username: this.user, + }).then(page => { + this.readonly = true; + this.page = page; + }); + } else { + this.page = null; } } }); diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts index 136bbc31c4..4a79d88773 100644 --- a/src/client/app/mobile/script.ts +++ b/src/client/app/mobile/script.ts @@ -146,7 +146,7 @@ init((launch, os) => { { path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/i/drive/file/:file', component: MkDrive }, { path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, - { path: '/i/pages/edit/:page', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, + { path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, { path: '/selectdrive', component: MkSelectDrive }, { path: '/search', component: MkSearch }, { path: '/tags/:tag', component: MkTag }, @@ -160,6 +160,7 @@ init((launch, os) => { { path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) }, ]}, { path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) }, + { path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, { path: '/notes/:note', component: MkNote }, { path: '/authorize-follow', component: MkFollow }, { path: '*', component: MkNotFound } diff --git a/src/client/app/mobile/views/pages/page-editor.vue b/src/client/app/mobile/views/pages/page-editor.vue index 9d549c784f..0b04f25802 100644 --- a/src/client/app/mobile/views/pages/page-editor.vue +++ b/src/client/app/mobile/views/pages/page-editor.vue @@ -1,7 +1,7 @@ <template> <mk-ui> <main> - <x-page-editor :page="page"/> + <x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/> </main> </mk-ui> </template> @@ -15,9 +15,44 @@ export default Vue.extend({ }, props: { - page: { + pageId: { type: String, required: false + }, + pageName: { + type: String, + required: false + }, + user: { + type: String, + required: false + } + }, + + data() { + return { + page: undefined, + readonly: false + }; + }, + + created() { + if (this.pageId) { + this.$root.api('pages/show', { + pageId: this.pageId, + }).then(page => { + this.page = page; + }); + } else if (this.pageName && this.user) { + this.$root.api('pages/show', { + name: this.pageName, + username: this.user, + }).then(page => { + this.readonly = true; + this.page = page; + }); + } else { + this.page = null; } } }); diff --git a/src/misc/aiscript/evaluator.ts b/src/misc/aiscript/evaluator.ts new file mode 100644 index 0000000000..fef2d4f3a5 --- /dev/null +++ b/src/misc/aiscript/evaluator.ts @@ -0,0 +1,240 @@ +import autobind from 'autobind-decorator'; +import * as seedrandom from 'seedrandom'; +import { Variable, PageVar, envVarsDef, funcDefs, Block, isFnBlock } from '.'; + +type Fn = { + slots: string[]; + exec: (args: Record<string, any>) => ReturnType<ASEvaluator['evaluate']>; +}; + +class AiScriptError extends Error { + public info?: any; + + constructor(message: string, info?: any) { + super(message); + + this.info = info; + + // Maintains proper stack trace for where our error was thrown (only available on V8) + if (Error.captureStackTrace) { + Error.captureStackTrace(this, AiScriptError); + } + } +} + +class Scope { + private layerdStates: Record<string, any>[]; + public name: string; + + constructor(layerdStates: Scope['layerdStates'], name?: Scope['name']) { + this.layerdStates = layerdStates; + this.name = name || 'anonymous'; + } + + @autobind + public createChildScope(states: Record<string, any>, name?: Scope['name']): Scope { + const layer = [states, ...this.layerdStates]; + return new Scope(layer, name); + } + + /** + * 指定した名前の変数の値を取得します + * @param name 変数名 + */ + @autobind + public getState(name: string): any { + for (const later of this.layerdStates) { + const state = later[name]; + if (state !== undefined) { + return state; + } + } + + throw new AiScriptError( + `No such variable '${name}' in scope '${this.name}'`, { + scope: this.layerdStates + }); + } +} + +/** + * AiScript evaluator + */ +export class ASEvaluator { + private variables: Variable[]; + private pageVars: PageVar[]; + private envVars: Record<keyof typeof envVarsDef, any>; + + private opts: { + randomSeed: string; user?: any; visitor?: any; page?: any; url?: string; version: string; + }; + + constructor(variables: Variable[], pageVars: PageVar[], opts: ASEvaluator['opts']) { + this.variables = variables; + this.pageVars = pageVars; + this.opts = opts; + + const date = new Date(); + + this.envVars = { + AI: 'kawaii', + VERSION: opts.version, + URL: opts.page ? `${opts.url}/@${opts.page.user.username}/pages/${opts.page.name}` : '', + LOGIN: opts.visitor != null, + NAME: opts.visitor ? opts.visitor.name : '', + USERNAME: opts.visitor ? opts.visitor.username : '', + USERID: opts.visitor ? opts.visitor.id : '', + NOTES_COUNT: opts.visitor ? opts.visitor.notesCount : 0, + FOLLOWERS_COUNT: opts.visitor ? opts.visitor.followersCount : 0, + FOLLOWING_COUNT: opts.visitor ? opts.visitor.followingCount : 0, + IS_CAT: opts.visitor ? opts.visitor.isCat : false, + MY_NOTES_COUNT: opts.user ? opts.user.notesCount : 0, + MY_FOLLOWERS_COUNT: opts.user ? opts.user.followersCount : 0, + MY_FOLLOWING_COUNT: opts.user ? opts.user.followingCount : 0, + SEED: opts.randomSeed ? opts.randomSeed : '', + YMD: `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}` + }; + } + + @autobind + public updatePageVar(name: string, value: any) { + const pageVar = this.pageVars.find(v => v.name === name); + if (pageVar !== undefined) { + pageVar.value = value; + } else { + throw new AiScriptError(`No such page var '${name}'`); + } + } + + @autobind + public updateRandomSeed(seed: string) { + this.opts.randomSeed = seed; + this.envVars.SEED = seed; + } + + @autobind + private interpolate(str: string, scope: Scope) { + return str.replace(/\{(.+?)\}/g, match => { + const v = scope.getState(match.slice(1, -1).trim()); + return v == null ? 'NULL' : v.toString(); + }); + } + + @autobind + public evaluateVars(): Record<string, any> { + const values: Record<string, any> = {}; + + for (const [k, v] of Object.entries(this.envVars)) { + values[k] = v; + } + + for (const v of this.pageVars) { + values[v.name] = v.value; + } + + for (const v of this.variables) { + values[v.name] = this.evaluate(v, new Scope([values])); + } + + return values; + } + + @autobind + private evaluate(block: Block, scope: Scope): any { + if (block.type === null) { + return null; + } + + if (block.type === 'number') { + return parseInt(block.value, 10); + } + + if (block.type === 'text' || block.type === 'multiLineText') { + return this.interpolate(block.value || '', scope); + } + + if (block.type === 'textList') { + return block.value.trim().split('\n'); + } + + if (block.type === 'ref') { + return scope.getState(block.value); + } + + if (isFnBlock(block)) { // ユーザー関数定義 + return { + slots: block.value.slots.map(x => x.name), + exec: (slotArg: Record<string, any>) => { + return this.evaluate(block.value.expression, scope.createChildScope(slotArg, block.id)); + } + } as Fn; + } + + if (block.type.startsWith('fn:')) { // ユーザー関数呼び出し + const fnName = block.type.split(':')[1]; + const fn = scope.getState(fnName); + const args = {} as Record<string, any>; + for (let i = 0; i < fn.slots.length; i++) { + const name = fn.slots[i]; + args[name] = this.evaluate(block.args[i], scope); + } + return fn.exec(args); + } + + if (block.args === undefined) return null; + + const date = new Date(); + const day = `${this.opts.visitor ? this.opts.visitor.id : ''} ${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`; + + const funcs: { [p in keyof typeof funcDefs]: Function } = { + not: (a: boolean) => !a, + or: (a: boolean, b: boolean) => a || b, + and: (a: boolean, b: boolean) => a && b, + eq: (a: any, b: any) => a === b, + notEq: (a: any, b: any) => a !== b, + gt: (a: number, b: number) => a > b, + lt: (a: number, b: number) => a < b, + gtEq: (a: number, b: number) => a >= b, + ltEq: (a: number, b: number) => a <= b, + if: (bool: boolean, a: any, b: any) => bool ? a : b, + for: (times: number, fn: Fn) => { + const result = []; + for (let i = 0; i < times; i++) { + result.push(fn.exec({ + [fn.slots[0]]: i + 1 + })); + } + return result; + }, + add: (a: number, b: number) => a + b, + subtract: (a: number, b: number) => a - b, + multiply: (a: number, b: number) => a * b, + divide: (a: number, b: number) => a / b, + strLen: (a: string) => a.length, + strPick: (a: string, b: number) => a[b - 1], + strReplace: (a: string, b: string, c: string) => a.split(b).join(c), + strReverse: (a: string) => a.split('').reverse().join(''), + join: (texts: string[], separator: string) => texts.join(separator || ''), + stringToNumber: (a: string) => parseInt(a), + numberToString: (a: number) => a.toString(), + splitStrByLine: (a: string) => a.split('\n'), + random: (probability: number) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability, + rannum: (min: number, max: number) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)), + randomPick: (list: any[]) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)], + dailyRandom: (probability: number) => Math.floor(seedrandom(`${day}:${block.id}`)() * 100) < probability, + dailyRannum: (min: number, max: number) => min + Math.floor(seedrandom(`${day}:${block.id}`)() * (max - min + 1)), + dailyRandomPick: (list: any[]) => list[Math.floor(seedrandom(`${day}:${block.id}`)() * list.length)], + seedRandom: (seed: any, probability: number) => Math.floor(seedrandom(seed)() * 100) < probability, + seedRannum: (seed: any, min: number, max: number) => min + Math.floor(seedrandom(seed)() * (max - min + 1)), + seedRandomPick: (seed: any, list: any[]) => list[Math.floor(seedrandom(seed)() * list.length)], + }; + + const fnName = block.type; + const fn = (funcs as any)[fnName]; + if (fn == null) { + throw new AiScriptError(`No such function '${fnName}'`); + } else { + return fn(...block.args.map(x => this.evaluate(x, scope))); + } + } +} diff --git a/src/misc/aiscript/index.ts b/src/misc/aiscript/index.ts new file mode 100644 index 0000000000..711cfb41eb --- /dev/null +++ b/src/misc/aiscript/index.ts @@ -0,0 +1,132 @@ +/** + * AiScript + */ + +import { + faMagic, + faSquareRootAlt, + faAlignLeft, + faShareAlt, + faPlus, + faMinus, + faTimes, + faDivide, + faList, + faQuoteRight, + faEquals, + faGreaterThan, + faLessThan, + faGreaterThanEqual, + faLessThanEqual, + faNotEqual, + faDice, + faSortNumericUp, + faExchangeAlt, + faRecycle, +} from '@fortawesome/free-solid-svg-icons'; +import { faFlag } from '@fortawesome/free-regular-svg-icons'; + +export type Block<V = any> = { + id: string; + type: string; + args: Block[]; + value: V; +}; + +export type FnBlock = Block<{ + slots: { + name: string; + type: Type; + }[]; + expression: Block; +}>; + +export type Variable = Block & { + name: string; +}; + +export type Type = 'string' | 'number' | 'boolean' | 'stringArray' | null; + +export const funcDefs: Record<string, { in: any[]; out: any; category: string; icon: any; }> = { + if: { in: ['boolean', 0, 0], out: 0, category: 'flow', icon: faShareAlt, }, + for: { in: ['number', 'function'], out: null, category: 'flow', icon: faRecycle, }, + not: { in: ['boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, + or: { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, + and: { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical', icon: faFlag, }, + add: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faPlus, }, + subtract: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faMinus, }, + multiply: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faTimes, }, + divide: { in: ['number', 'number'], out: 'number', category: 'operation', icon: faDivide, }, + eq: { in: [0, 0], out: 'boolean', category: 'comparison', icon: faEquals, }, + notEq: { in: [0, 0], out: 'boolean', category: 'comparison', icon: faNotEqual, }, + gt: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faGreaterThan, }, + lt: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faLessThan, }, + gtEq: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faGreaterThanEqual, }, + ltEq: { in: ['number', 'number'], out: 'boolean', category: 'comparison', icon: faLessThanEqual, }, + strLen: { in: ['string'], out: 'number', category: 'text', icon: faQuoteRight, }, + strPick: { in: ['string', 'number'], out: 'string', category: 'text', icon: faQuoteRight, }, + strReplace: { in: ['string', 'string', 'string'], out: 'string', category: 'text', icon: faQuoteRight, }, + strReverse: { in: ['string'], out: 'string', category: 'text', icon: faQuoteRight, }, + join: { in: ['stringArray', 'string'], out: 'string', category: 'text', icon: faQuoteRight, }, + stringToNumber: { in: ['string'], out: 'number', category: 'convert', icon: faExchangeAlt, }, + numberToString: { in: ['number'], out: 'string', category: 'convert', icon: faExchangeAlt, }, + splitStrByLine: { in: ['string'], out: 'stringArray', category: 'convert', icon: faExchangeAlt, }, + rannum: { in: ['number', 'number'], out: 'number', category: 'random', icon: faDice, }, + dailyRannum: { in: ['number', 'number'], out: 'number', category: 'random', icon: faDice, }, + seedRannum: { in: [null, 'number', 'number'], out: 'number', category: 'random', icon: faDice, }, + random: { in: ['number'], out: 'boolean', category: 'random', icon: faDice, }, + dailyRandom: { in: ['number'], out: 'boolean', category: 'random', icon: faDice, }, + seedRandom: { in: [null, 'number'], out: 'boolean', category: 'random', icon: faDice, }, + randomPick: { in: [0], out: 0, category: 'random', icon: faDice, }, + dailyRandomPick: { in: [0], out: 0, category: 'random', icon: faDice, }, + seedRandomPick: { in: [null, 0], out: 0, category: 'random', icon: faDice, }, +}; + +export const literalDefs: Record<string, { out: any; category: string; icon: any; }> = { + text: { out: 'string', category: 'value', icon: faQuoteRight, }, + multiLineText: { out: 'string', category: 'value', icon: faAlignLeft, }, + textList: { out: 'stringArray', category: 'value', icon: faList, }, + number: { out: 'number', category: 'value', icon: faSortNumericUp, }, + ref: { out: null, category: 'value', icon: faMagic, }, + fn: { out: 'function', category: 'value', icon: faSquareRootAlt, }, +}; + +export const blockDefs = [ + ...Object.entries(literalDefs).map(([k, v]) => ({ + type: k, out: v.out, category: v.category, icon: v.icon + })), + ...Object.entries(funcDefs).map(([k, v]) => ({ + type: k, out: v.out, category: v.category, icon: v.icon + })) +]; + +export function isFnBlock(block: Block): block is FnBlock { + return block.type === 'fn'; +} + +export type PageVar = { name: string; value: any; type: Type; }; + +export const envVarsDef: Record<string, Type> = { + AI: 'string', + URL: 'string', + VERSION: 'string', + LOGIN: 'boolean', + NAME: 'string', + USERNAME: 'string', + USERID: 'string', + NOTES_COUNT: 'number', + FOLLOWERS_COUNT: 'number', + FOLLOWING_COUNT: 'number', + IS_CAT: 'boolean', + MY_NOTES_COUNT: 'number', + MY_FOLLOWERS_COUNT: 'number', + MY_FOLLOWING_COUNT: 'number', + SEED: null, + YMD: 'string', +}; + +export function isLiteralBlock(v: Block) { + if (v.type === null) return true; + if (literalDefs[v.type]) return true; + return false; +} diff --git a/src/misc/aiscript/type-checker.ts b/src/misc/aiscript/type-checker.ts new file mode 100644 index 0000000000..817e549864 --- /dev/null +++ b/src/misc/aiscript/type-checker.ts @@ -0,0 +1,186 @@ +import autobind from 'autobind-decorator'; +import { Type, Block, funcDefs, envVarsDef, Variable, PageVar, isLiteralBlock } from '.'; + +type TypeError = { + arg: number; + expect: Type; + actual: Type; +}; + +/** + * AiScript type checker + */ +export class ASTypeChecker { + public variables: Variable[]; + public pageVars: PageVar[]; + + constructor(variables: ASTypeChecker['variables'] = [], pageVars: ASTypeChecker['pageVars'] = []) { + this.variables = variables; + this.pageVars = pageVars; + } + + @autobind + public typeCheck(v: Block): TypeError | null { + if (isLiteralBlock(v)) return null; + + const def = funcDefs[v.type]; + if (def == null) { + throw new Error('Unknown type: ' + v.type); + } + + const generic: Type[] = []; + + for (let i = 0; i < def.in.length; i++) { + const arg = def.in[i]; + const type = this.infer(v.args[i]); + if (type === null) continue; + + if (typeof arg === 'number') { + if (generic[arg] === undefined) { + generic[arg] = type; + } else if (type !== generic[arg]) { + return { + arg: i, + expect: generic[arg], + actual: type + }; + } + } else if (type !== arg) { + return { + arg: i, + expect: arg, + actual: type + }; + } + } + + return null; + } + + @autobind + public getExpectedType(v: Block, slot: number): Type { + const def = funcDefs[v.type]; + if (def == null) { + throw new Error('Unknown type: ' + v.type); + } + + const generic: Type[] = []; + + for (let i = 0; i < def.in.length; i++) { + const arg = def.in[i]; + const type = this.infer(v.args[i]); + if (type === null) continue; + + if (typeof arg === 'number') { + if (generic[arg] === undefined) { + generic[arg] = type; + } + } + } + + if (typeof def.in[slot] === 'number') { + return generic[def.in[slot]] || null; + } else { + return def.in[slot]; + } + } + + @autobind + public infer(v: Block): Type { + if (v.type === null) return null; + if (v.type === 'text') return 'string'; + if (v.type === 'multiLineText') return 'string'; + if (v.type === 'textList') return 'stringArray'; + if (v.type === 'number') return 'number'; + if (v.type === 'ref') { + const variable = this.variables.find(va => va.name === v.value); + if (variable) { + return this.infer(variable); + } + + const pageVar = this.pageVars.find(va => va.name === v.value); + if (pageVar) { + return pageVar.type; + } + + const envVar = envVarsDef[v.value]; + if (envVar !== undefined) { + return envVar; + } + + return null; + } + if (v.type === 'fn') return null; // todo + if (v.type.startsWith('fn:')) return null; // todo + + const generic: Type[] = []; + + const def = funcDefs[v.type]; + + for (let i = 0; i < def.in.length; i++) { + const arg = def.in[i]; + if (typeof arg === 'number') { + const type = this.infer(v.args[i]); + + if (generic[arg] === undefined) { + generic[arg] = type; + } else { + if (type !== generic[arg]) { + generic[arg] = null; + } + } + } + } + + if (typeof def.out === 'number') { + return generic[def.out]; + } else { + return def.out; + } + } + + @autobind + public getVarByName(name: string): Variable { + const v = this.variables.find(x => x.name === name); + if (v !== undefined) { + return v; + } else { + throw new Error(`No such variable '${name}'`); + } + } + + @autobind + public getVarsByType(type: Type): Variable[] { + if (type == null) return this.variables; + return this.variables.filter(x => (this.infer(x) === null) || (this.infer(x) === type)); + } + + @autobind + public getEnvVarsByType(type: Type): string[] { + if (type == null) return Object.keys(envVarsDef); + return Object.entries(envVarsDef).filter(([k, v]) => v === null || type === v).map(([k, v]) => k); + } + + @autobind + public getPageVarsByType(type: Type): string[] { + if (type == null) return this.pageVars.map(v => v.name); + return this.pageVars.filter(v => type === v.type).map(v => v.name); + } + + @autobind + public isUsedName(name: string) { + if (this.variables.some(v => v.name === name)) { + return true; + } + + if (this.pageVars.some(v => v.name === name)) { + return true; + } + + if (envVarsDef[name]) { + return true; + } + + return false; + } +} diff --git a/src/models/repositories/page.ts b/src/models/repositories/page.ts index cbe385568e..2293edbc0d 100644 --- a/src/models/repositories/page.ts +++ b/src/models/repositories/page.ts @@ -84,5 +84,51 @@ export const packedPageSchema = { type: types.object, optional: bool.false, nullable: bool.false, properties: { + id: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'date-time', + }, + updatedAt: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'date-time', + }, + title: { + type: types.string, + optional: bool.false, nullable: bool.false, + }, + name: { + type: types.string, + optional: bool.false, nullable: bool.false, + }, + summary: { + type: types.string, + optional: bool.false, nullable: bool.true, + }, + content: { + type: types.array, + optional: bool.false, nullable: bool.false, + }, + variables: { + type: types.array, + optional: bool.false, nullable: bool.false, + }, + userId: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id', + }, + user: { + type: types.object, + ref: 'User', + optional: bool.false, nullable: bool.false, + }, } }; diff --git a/src/server/api/kinds.ts b/src/server/api/kinds.ts index 03ed3e7cd8..99c3795589 100644 --- a/src/server/api/kinds.ts +++ b/src/server/api/kinds.ts @@ -18,5 +18,7 @@ export const kinds = [ 'write:notifications', 'read:reactions', 'write:reactions', - 'write:votes' + 'write:votes', + 'read:pages', + 'write:pages', ]; diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts index 34e6f8947d..229d10af2a 100644 --- a/src/server/api/openapi/schemas.ts +++ b/src/server/api/openapi/schemas.ts @@ -12,6 +12,7 @@ import { packedMutingSchema } from '../../../models/repositories/muting'; import { packedBlockingSchema } from '../../../models/repositories/blocking'; import { packedNoteReactionSchema } from '../../../models/repositories/note-reaction'; import { packedHashtagSchema } from '../../../models/repositories/hashtag'; +import { packedPageSchema } from '../../../models/repositories/page'; export function convertSchemaToOpenApiSchema(schema: Schema) { const res: any = schema; @@ -76,4 +77,5 @@ export const schemas = { Blocking: convertSchemaToOpenApiSchema(packedBlockingSchema), NoteReaction: convertSchemaToOpenApiSchema(packedNoteReactionSchema), Hashtag: convertSchemaToOpenApiSchema(packedHashtagSchema), + Page: convertSchemaToOpenApiSchema(packedPageSchema), }; diff --git a/src/server/api/stream/channels/main.ts b/src/server/api/stream/channels/main.ts index 1100f87acb..5abe108789 100644 --- a/src/server/api/stream/channels/main.ts +++ b/src/server/api/stream/channels/main.ts @@ -22,6 +22,7 @@ export default class extends Channel { break; } case 'mention': { + if (mute.map(m => m.muteeId).includes(body.userId)) return; if (body.isHidden) return; break; } |