nadesiko3 3.3.57 → 3.3.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/core/package.json +1 -1
  2. package/core/src/nako_core_version.mjs +2 -2
  3. package/core/src/nako_core_version.mts +2 -2
  4. package/core/src/nako_indent_inline.mjs +5 -1
  5. package/core/src/nako_indent_inline.mts +4 -1
  6. package/core/test/indent_test.mjs +12 -1
  7. package/demo/index.html +0 -1
  8. package/package.json +1 -1
  9. package/release/_hash.txt +16 -16
  10. package/release/_script-tags.txt +14 -14
  11. package/release/nako_gen_async.js +1 -1
  12. package/release/stats.json +1 -1
  13. package/release/version.js +1 -1
  14. package/release/wnako3.js +1 -1
  15. package/release/wnako3webworker.js +1 -1
  16. package/src/nako_version.mjs +2 -2
  17. package/src/nako_version.mts +2 -2
  18. package/tools/nako3server/index.mjs +7 -3
package/core/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nadesiko3core",
3
- "version": "3.3.56",
3
+ "version": "3.3.58",
4
4
  "description": "Japanese Programming Language Nadesiko v3 core",
5
5
  "main": "index.mjs",
6
6
  "type": "module",
package/core/src/nako_core_version.mjs CHANGED
@@ -1,8 +1,8 @@
1
1
  // 実際のバージョン定義 (自動生成されるので以下を編集しない)
2
2
  const coreVersion = {
3
- version: '3.3.56',
3
+ version: '3.3.58',
4
4
  major: 3,
5
5
  minor: 3,
6
- patch: 56
6
+ patch: 58
7
7
  };
8
8
  export default coreVersion;
package/core/src/nako_core_version.mts CHANGED
@@ -11,9 +11,9 @@ export interface NakoCoreVersion {
11
11
  }
12
12
  // 実際のバージョン定義 (自動生成されるので以下を編集しない)
13
13
  const coreVersion: NakoCoreVersion = {
14
- version: '3.3.56',
14
+ version: '3.3.58',
15
15
  major: 3,
16
16
  minor: 3,
17
- patch: 56
17
+ patch: 58
18
18
  }
19
19
  export default coreVersion
package/core/src/nako_indent_inline.mjs CHANGED
@@ -43,7 +43,11 @@ export function convert(code) {
43
43
  while (checkICount >= lineICount) {
44
44
  const prevLine = removeCommentsFromLine(lines[i - 1]);
45
45
  // eslint-disable-next-line no-irregular-whitespace
46
- if (line.replace(/^[ 　・\t]+/, '').charAt(0) !== '違') {
46
+ const lineTrimed = line.replace(/^[ 　・\t]+/, '');
47
+ if (lineTrimed.charAt(0) === '違' || lineTrimed.substring(0, 6) === 'エラーならば') {
48
+ // この場合、ここまでは不要
49
+ }
50
+ else {
47
51
  lines[i - 1] = prevLine + KOKOMADE;
48
52
  }
49
53
  // 現在のブロックの処理が完了
package/core/src/nako_indent_inline.mts CHANGED
@@ -46,7 +46,10 @@ export function convert (code: string): string {
46
46
  while (checkICount >= lineICount) {
47
47
  const prevLine = removeCommentsFromLine(lines[i - 1])
48
48
  // eslint-disable-next-line no-irregular-whitespace
49
- if (line.replace(/^[ 　・\t]+/, '').charAt(0) !== '違') {
49
+ const lineTrimed = line.replace(/^[ 　・\t]+/, '')
50
+ if (lineTrimed.charAt(0) === '違' || lineTrimed.substring(0, 6) === 'エラーならば') {
51
+ // この場合、ここまでは不要
52
+ } else {
50
53
  lines[i - 1] = prevLine + KOKOMADE
51
54
  }
52
55
  // 現在のブロックの処理が完了
package/core/test/indent_test.mjs CHANGED
@@ -380,7 +380,18 @@ describe('indent', () => {
380
380
  '違えば\n' +
381
381
  ' b;ここまで\n')
382
382
  })
383
- it('#1215 インラインインデント構文3 - ネスト', () => {
383
+ it('#1215 インラインインデント構文 - エラー監視', () => {
384
+ assert.strictEqual(NakoIndentInline.convert(
385
+ 'エラー監視:\n' +
386
+ ' a\n' +
387
+ 'エラーならば:\n' +
388
+ ' b\n'),
389
+ 'エラー監視\n' +
390
+ ' a\n' +
391
+ 'エラーならば\n' +
392
+ ' b;ここまで\n')
393
+ })
394
+ it('#1215 インラインインデント構文3 - ネスト', () => {
384
395
  assert.strictEqual(NakoIndentInline.convert(
385
396
  '3回：\n' +
386
397
  '　　4回：\n' +
package/demo/index.html CHANGED
@@ -111,7 +111,6 @@
111
111
  <script src="../release/editor.js"></script>
112
112
  <script src="../release/version.js"></script>
113
113
  <script src="../release/plugin_markup.js"></script>
114
- <script src="../release/plugin_csv.js"></script>
115
114
  <script src="../release/plugin_kansuji.js"></script>
116
115
  <script src="../release/plugin_turtle.js"></script>
117
116
  <script src="../release/plugin_caniuse.js"></script>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nadesiko3",
3
- "version": "3.3.57",
3
+ "version": "3.3.58",
4
4
  "description": "Japanese Programming Language",
5
5
  "type": "module",
6
6
  "main": "src/index.mjs",
package/release/_hash.txt CHANGED
@@ -9,10 +9,10 @@ editor.js:
9
9
  sha256(base64): mWPVpxYoegeIn6u0PanyI4Z8eRx41UD/kBYns489U04=
10
10
  sha512(base64): q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==
11
11
  nako_gen_async.js:
12
- md5(hex): db02cfaf08caf9462659c2cf0615a8ab
13
- sha256(hex): f165885cbb486f2672cc23792915415a182aea1c1f13216e6a5304867dff5661
14
- sha256(base64): 8WWIXLtIbyZyzCN5KRVBWhgq6hwfEyFualMEhn3/VmE=
15
- sha512(base64): cc2MnqdUeywix4MZeXMVF+S8SZczhgPSMqjz9pgKoIPqmVSRJgJvrvvohBnruOp/CFYl6DN/QM9X2ic6a0Hzfg==
12
+ md5(hex): 84fa8b4db1d5ee9c190096d14d380c99
13
+ sha256(hex): 61b6c7d40ad146862b6ea8d93be2f40880f5bfac6e88a19c99f9c95650db0319
14
+ sha256(base64): YbbH1ArRRoYrbqjZO+L0CID1v6xuiKGcmfnJVlDbAxk=
15
+ sha512(base64): Jq9JpTvQJJ92kBkr5uZayNOSUQDO3f5oZHGi0UTfBbAkbVP4DrHT01XeU/BU3jOUNfLQH/WoVg4yCd16sFmowA==
16
16
  plugin_caniuse.js:
17
17
  md5(hex): 95a7a5c98a92a46b6435e577daba3241
18
18
  sha256(hex): 57638b3979be70b45ab8085861f6b2ece43200bd6aa92765d73caf76b9e6fea9
@@ -54,17 +54,17 @@ plugin_weykturtle3d.js:
54
54
  sha256(base64): ND/1JqYrFVGTIPYsbBk+tScnF8RVzgYPM0/E2aE8GRw=
55
55
  sha512(base64): T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==
56
56
  version.js:
57
- md5(hex): 9681ac3d910bd56b2194cdf48a1462aa
58
- sha256(hex): e28a5f76cd39efcbbcb53dbaaa922da5ca35c9fce89ef40e3a1c79f7de326784
59
- sha256(base64): 4opfds0578u8tT26qpItpco1yfzonvQOOhx5994yZ4Q=
60
- sha512(base64): Bf91F4iZ+nzlovtUVJd1/BE8x+VNWu973VaOsfq0b8gyWaxZnUHdYURHO+uv0laGxhmUvCxk/vDGcQmGdMC6iw==
57
+ md5(hex): cc2e969cd02a076998e695dcba6c4379
58
+ sha256(hex): 60e5ec6e3f984c1080106dc6ac7809169ecc713d50068a45d58932089a44fe00
59
+ sha256(base64): YOXsbj+YTBCAEG3GrHgJFp7McT1QBopF1YkyCJpE/gA=
60
+ sha512(base64): zyFdBFQ+UG0t/lDSrlnyJqBevwt2LIt+Q6vWsVX4mxUvJjQNeu8F1455dnQg3gw9GGznIWv2gaN/JxVdob7RMQ==
61
61
  wnako3.js:
62
- md5(hex): 81ba1b5e559ec0e9483a07551be9c471
63
- sha256(hex): fa8ac0db4ef12933b2779b47a9983ed201afa8694ae430cf4909bb40ee079a12
64
- sha256(base64): +orA207xKTOyd5tHqZg+0gGvqGlK5DDPSQm7QO4HmhI=
65
- sha512(base64): w9Z1H7vthyEYJQOCyS4byDP4kA8Qxq/TwcVvLPB7WP7Ci3IqhEoScO75BqqmFnCz44HVDYwOuYyJ0YVIIsFHtQ==
62
+ md5(hex): 77f84f987e688bc346fb31183537fa03
63
+ sha256(hex): 2334306d0ab8e85d5f75a9a1234f26013e3ccb6458da5c9aaff5ee1d6eac4dbf
64
+ sha256(base64): IzQwbQq46F1fdamhI08mAT48y2RY2lyar/XuHW6sTb8=
65
+ sha512(base64): J0T3vqk1/Nwy0iMO9/QZINvlp+yH/+CKtbzQnHVAGnQW58D9V6BnOiqtsL7z3jZI+D+MFQXhdCcWOMRotqikAQ==
66
66
  wnako3webworker.js:
67
- md5(hex): 7d743e60ee7c87fb40ebbb606ef34b8e
68
- sha256(hex): a278e5893afa310bf660f3f8b384ec1c733c5e2c07d23420cabcf72ccaf64ba6
69
- sha256(base64): onjliTr6MQv2YPP4s4TsHHM8XiwH0jQgyrz3LMr2S6Y=
70
- sha512(base64): HkP7Sv952Ub0fRRK1KjCZOnh7L/N5ZAAfFasHCRbuyiTgkCdYEky2aINlZEj8Q4k9U5D4U7yvSka9ya3NkTX9g==
67
+ md5(hex): c5c59183a9c50eac21684191ba0143de
68
+ sha256(hex): 7df66b63b66f5505afa2e6f069e1cdbcd8796f0c31c18c66bc121f8a9f4b972f
69
+ sha256(base64): ffZrY7ZvVQWvoubwaeHNvNh5bwwxwYxmvBIfip9Lly8=
70
+ sha512(base64): UX1+W9xFZLAD/JRMIH3zjpBLXjhL0mezKnjsoUqGTEwATXMa1bqfhmDZXq1IlrRYCqskSR2o4SttU2SEweMJSw==
package/release/_script-tags.txt CHANGED
@@ -1,14 +1,14 @@
1
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/command.json.js" integrity="sha512-3PHGfRGcyV9VPBflXtm5cP2qT4kGyPgTpCyrFhjUXMHQKRf6+2yGK6VCcAV6KCOkjWIzKVCGeoDo4Pzp+YtckQ==" crossorigin="anonymous"></script>
2
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/editor.js" integrity="sha512-q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==" crossorigin="anonymous"></script>
3
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/nako_gen_async.js" integrity="sha512-cc2MnqdUeywix4MZeXMVF+S8SZczhgPSMqjz9pgKoIPqmVSRJgJvrvvohBnruOp/CFYl6DN/QM9X2ic6a0Hzfg==" crossorigin="anonymous"></script>
4
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
5
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
6
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
7
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
8
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
9
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
10
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
11
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
12
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/version.js" integrity="sha512-Bf91F4iZ+nzlovtUVJd1/BE8x+VNWu973VaOsfq0b8gyWaxZnUHdYURHO+uv0laGxhmUvCxk/vDGcQmGdMC6iw==" crossorigin="anonymous"></script>
13
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/wnako3.js" integrity="sha512-w9Z1H7vthyEYJQOCyS4byDP4kA8Qxq/TwcVvLPB7WP7Ci3IqhEoScO75BqqmFnCz44HVDYwOuYyJ0YVIIsFHtQ==" crossorigin="anonymous"></script>
14
- <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.57&f=release/wnako3webworker.js" integrity="sha512-HkP7Sv952Ub0fRRK1KjCZOnh7L/N5ZAAfFasHCRbuyiTgkCdYEky2aINlZEj8Q4k9U5D4U7yvSka9ya3NkTX9g==" crossorigin="anonymous"></script>
1
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/command.json.js" integrity="sha512-3PHGfRGcyV9VPBflXtm5cP2qT4kGyPgTpCyrFhjUXMHQKRf6+2yGK6VCcAV6KCOkjWIzKVCGeoDo4Pzp+YtckQ==" crossorigin="anonymous"></script>
2
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/editor.js" integrity="sha512-q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==" crossorigin="anonymous"></script>
3
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/nako_gen_async.js" integrity="sha512-Jq9JpTvQJJ92kBkr5uZayNOSUQDO3f5oZHGi0UTfBbAkbVP4DrHT01XeU/BU3jOUNfLQH/WoVg4yCd16sFmowA==" crossorigin="anonymous"></script>
4
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
5
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
6
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
7
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
8
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
9
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
10
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
11
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
12
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/version.js" integrity="sha512-zyFdBFQ+UG0t/lDSrlnyJqBevwt2LIt+Q6vWsVX4mxUvJjQNeu8F1455dnQg3gw9GGznIWv2gaN/JxVdob7RMQ==" crossorigin="anonymous"></script>
13
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/wnako3.js" integrity="sha512-J0T3vqk1/Nwy0iMO9/QZINvlp+yH/+CKtbzQnHVAGnQW58D9V6BnOiqtsL7z3jZI+D+MFQXhdCcWOMRotqikAQ==" crossorigin="anonymous"></script>
14
+ <script defer src="https://nadesi.com/v3/cdn.php?v=3.3.58&f=release/wnako3webworker.js" integrity="sha512-UX1+W9xFZLAD/JRMIH3zjpBLXjhL0mezKnjsoUqGTEwATXMa1bqfhmDZXq1IlrRYCqskSR2o4SttU2SEweMJSw==" crossorigin="anonymous"></script>