nadesiko3 3.3.25 → 3.3.26

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nadesiko3",
3
- "version": "3.3.25",
3
+ "version": "3.3.26",
4
4
  "description": "Japanese Programming Language",
5
5
  "main": "src/index.mjs",
6
6
  "bin": {
package/src/cnako3mod.mts CHANGED
@@ -121,7 +121,7 @@ export class CNako3 extends NakoCompiler {
121
121
  args.mainfile = app.args[0]
122
122
  args.output = app.output
123
123
 
124
- // todo: ESModule 対応の '.mjs' のコードを履く #1217
124
+ // todo: ESModule 対応の '.mjs' のコードを吐くように修正 #1217
125
125
  const ext = '.js'
126
126
  if (/\.(nako|nako3|txt|bak)$/.test(args.mainfile)) {
127
127
  if (!args.output) {
@@ -624,9 +624,14 @@ export class CNako3 extends NakoCompiler {
624
624
  const fileRuntime = fCheckEx(pathRuntimePname, 'runtime')
625
625
  if (fileRuntime) { return fileRuntime }
626
626
 
627
- // ランタイムパス/node_modules/nadesiko3core/src/<plugin>
627
+ // ランタイムと同じ配置 | ランタイムパス/../<plugin>
628
+ const runtimeLib = path.join(pathRuntime, '..', pname)
629
+ const fileLib = fCheckEx(runtimeLib, 'runtimeLib')
630
+ if (fileLib) { return fileLib }
631
+
632
+ // nadesiko3core | ランタイムパス/node_modules/nadesiko3core/src/<plugin>
628
633
  const pathRuntimeSrc2 = path.join(pathRuntime, 'node_modules', 'nadesiko3core', 'src', pname) // cnako3mod.mjs は ランタイム/src に配置されていることが前提
629
- const fileRuntimeSrc2 = fCheckEx(pathRuntimeSrc2, 'runtimeSrcPath2')
634
+ const fileRuntimeSrc2 = fCheckEx(pathRuntimeSrc2, 'nadesiko3core')
630
635
  if (fileRuntimeSrc2) { return fileRuntimeSrc2 }
631
636
 
632
637
  // 環境変数 NAKO_HOMEか?