onejs-core 2.0.21 → 2.0.22

package/bin/oj.js

@@ -36,7 +36,7 @@ function findAssetsDir(startDir, explicit) {
         if (fs.existsSync(explicit) && fs.statSync(explicit).isDirectory()) return explicit
         return null
     }
-    let dir = startDir
+    let dir = path.dirname(startDir) // Up a level, preventing `App/assets` getting returned
     const { root } = path.parse(dir)
     while (dir !== root) {
         const probe = path.join(dir, "Assets")
@@ -80,10 +80,17 @@ async function scanComponents(tarPath) {
     await tar.t({
         file: tarPath,
         onentry: (entry) => {
-            const p = entry.path
+            const p = entry.path.replace(/\\/g, "/")
             if (!p.startsWith("comps/")) return
-            const parts = p.split("/").filter(Boolean) // ["comps","button", ...]
-            if (parts.length >= 2) comps.add(parts[1])
+
+            // Only treat entries inside a top-level folder under comps/
+            // e.g. "comps/button/**" → "button"
+            const rest = p.slice("comps/".length)
+            const firstSlash = rest.indexOf("/")
+            if (firstSlash === -1) return // file directly under comps/ → skip
+
+            const top = rest.slice(0, firstSlash)
+            if (top) comps.add(top)
         },
     })
     return comps
@@ -244,4 +251,4 @@ program
 program.parseAsync().catch((err) => {
     console.error(err)
     process.exit(1)
-})
+})

package/dist/index.d.ts

@@ -19,4 +19,7 @@ declare global {
         new (...args: any[]): T;
     }, count: number) => CS.System.Array;
     const toJsArray: <T>(csArr: CS.System.Array) => T[];
+    const toCsArray: <T>(jsArr: T[], type: {
+        new (...args: any[]): T;
+    }) => CS.System.Array;
 }

package/index.ts

@@ -44,6 +44,7 @@ declare global {
     }
     const newCsArray: <T>(type: { new(...args: any[]): T }, count: number) => CS.System.Array
     const toJsArray: <T>(csArr: CS.System.Array) => T[]
+    const toCsArray: <T>(jsArr: T[], type: { new(...args: any[]): T }) => CS.System.Array
 }
 
 if (typeof globalThis.___document != "undefined") {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "2.0.21",
+    "version": "2.0.22",
     "repository": {
         "type": "git",
         "url": "https://github.com/Singtaa/onejs-core"