fix bugs with use as module (cli, file resolution)

Author: drinking-code

cli/index

@@ -1,9 +1,20 @@
 #!/bin/bash
 
-if [[ "$*" == *"--node"* ]]; then
-  /usr/bin/env node cli/main.js -- "$@"
-elif command /usr/bin/env bun &>/dev/null; then
-  /usr/bin/env bun cli/main.js -- "$@"
-elif command /usr/bin/env node &>/dev/null; then
-  /usr/bin/env node cli/main.js -- "$@"
+CC_MAIN_SCRIPT_PARTIAL="cherry-cola/cli/main.js"
+DIRNAME=$(dirname "$0")
+
+if [[ $DIRNAME == *node_modules/.bin ]]; then
+  CC_MAIN_SCRIPT="${DIRNAME//.bin/$CC_MAIN_SCRIPT_PARTIAL}"
+else
+  CC_MAIN_SCRIPT="${DIRNAME}/main.js"
 fi
+
+/usr/bin/env bun "$CC_MAIN_SCRIPT" -- "$@"
+
+#if [[ "$*" == *"--node"* ]]; then
+#  /usr/bin/env node "$CC_MAIN_SCRIPT" -- "$@"
+#elif command /usr/bin/env bun &>/dev/null; then
+#  /usr/bin/env bun "$CC_MAIN_SCRIPT" -- "$@"
+#elif command /usr/bin/env node &>/dev/null; then
+#  /usr/bin/env node "$CC_MAIN_SCRIPT" -- "$@"
+#fi

example/cherry-cola-template/App.css

@@ -10,7 +10,7 @@
 
 @media (prefers-color-scheme: dark) {
     .App {
-        background: #211e1e;
+        background: #222;
         color: #fff;
     }
 }

example/counter/index.css

@@ -12,7 +12,7 @@ body {
 
 @media (prefers-color-scheme: dark) {
     body {
-        background: #211e1e;
+        background: #222;
         color: #fff;
     }
 }

src/compiler/helpers/resolve-import-file-specifier.ts

@@ -1,13 +1,17 @@
 import resolveFile from './resolve-file'
 import projectRoot, {resolve as resolveProjectRoot} from '../../utils/project-root'
+import moduleRoot, {resolve as resolveModuleRoot} from '../../utils/module-root'
 import {printWarning, messages as warningMessages} from '../../messages/warnings'
 
-const packageJson = await (Bun.file(resolveProjectRoot('package.json')) as File & { json: () => object }).json()
+const projectPackageJson = await (Bun.file(resolveProjectRoot('package.json')) as File & { json: () => object }).json()
+const modulePackageJson = await (Bun.file(resolveModuleRoot('package.json')) as File & { json: () => object }).json()
 
 export default function resolveImportFileSpecifier(base: string, fileSpecifier: string) {
     if (fileSpecifier.startsWith('#')) {
-        if ('imports' in packageJson)
-            fileSpecifier = resolveProjectRoot(packageJson.imports[fileSpecifier])
+        if ('imports' in projectPackageJson)
+            fileSpecifier = resolveProjectRoot(projectPackageJson.imports[fileSpecifier])
+        else if ('imports' in modulePackageJson)
+            fileSpecifier = resolveModuleRoot(modulePackageJson.imports[fileSpecifier])
         else
             printWarning(warningMessages.resolve.noImports, [fileSpecifier])
     } else {

src/utils/module-root.js

@@ -5,5 +5,5 @@ process.env.APP_MODULE_PATH = findDirWith('package.json')
 export default process.env.APP_MODULE_PATH
 
 export function resolve(...filePath) {
-    return path.join(process.env.PROJECT_ROOT_PATH, ...filePath)
+    return path.join(process.env.APP_MODULE_PATH, ...filePath)
 }