onejs-core 3.0.4 → 3.0.5

package/bin/oj.js

@@ -1,254 +1,254 @@
 #!/usr/bin/env node
-/* eslint-disable no-console */
-"use strict"
-
-/*
- * OneJS – oj (shadcn-style) CLI
- * A small utility for listing / installing premade UI components
- * shipped inside a <Assets/> Unity project folder.
- *
- * Commands:
- *   oj list                       – show available components inside tarball
- *   oj add <name … | all>         – install one or many components
- *   oj doctor                     – verify environment (Assets folder + tarball)
- *
- * Global flags:
- *   -y, --yes, --force            – skip overwrite prompts
- *   --dry                         – dry-run (no filesystem writes)
- *   --assets-dir <dir>            – override Assets directory auto-detection
- *   --tarball <file>              – override tarball filename (default premade-uis.tgz.bytes)
- */
-
-const fs = require("fs")
-const path = require("path")
-const readline = require("readline")
-const tar = require("tar")
-const { Command } = require("commander")
-const chalk = require("chalk")
-const ora = require("ora")
-
-const pkg = require("../package.json")
-
-/* ─────────────────────────────── utils ─────────────────────────────── */
-
-function findAssetsDir(startDir, explicit) {
-    if (explicit) {
-        if (fs.existsSync(explicit) && fs.statSync(explicit).isDirectory()) return explicit
-        return null
-    }
-    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")
-        if (fs.existsSync(probe) && fs.statSync(probe).isDirectory()) return probe
-        dir = path.dirname(dir)
-    }
-    return null
-}
-
-function findTarball(assetsDir, tarballName) {
-    const stack = [assetsDir]
-    while (stack.length) {
-        const curr = stack.pop()
-        for (const e of fs.readdirSync(curr, { withFileTypes: true })) {
-            const p = path.join(curr, e.name)
-            if (e.isDirectory()) {
-                stack.push(p)
-            } else if (e.isFile() && e.name === tarballName) {
-                return p
-            }
-        }
-    }
-    return null
-}
-
-async function askYN(prompt) {
-    return new Promise((resolve) => {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
-        rl.question(`${prompt} ${chalk.dim("[y/N]")} `, (ans) => {
-            rl.close()
-            resolve(/^(y|yes)$/i.test(ans.trim()))
-        })
-    })
-}
-
-/**
- * Return Set of top-level component folders inside tarball.
- */
-async function scanComponents(tarPath) {
-    const comps = new Set()
-    await tar.t({
-        file: tarPath,
-        onentry: (entry) => {
-            const p = entry.path.replace(/\\/g, "/")
-            if (!p.startsWith("comps/")) return
-
-            // 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
-}
-
-/* ─────────────────────────────── commander ─────────────────────────────── */
-
-const program = new Command()
-
-program
-    .name("oj")
-    .description("OneJS premade UI component manager")
-    .version(pkg.version, "-v, --version", "print version")
-
-program
-    .hook("preAction", (thisCmd, actionCmd) => {
-        // Collect global opts and attach to actionCmd for convenience
-        actionCmd._globalOpts = {
-            yes: thisCmd.opts().yes || thisCmd.opts().force,
-            dry: thisCmd.opts().dry,
-            assetsDir: thisCmd.opts().assetsDir,
-            tarballName: thisCmd.opts().tarball || "premade-uis.tgz.bytes",
-        }
-    })
-    .option("-y, --yes", "skip confirmation prompts")
-    .option("--force", "alias for --yes")
-    .option("--dry", "dry-run – show actions only")
-    .option("--assets-dir <dir>", "override Assets/ directory")
-    .option("--tarball <file>", "override tarball filename (default premade-uis.tgz.bytes)")
-
-/* ─────────────────────────────── list ─────────────────────────────── */
-
-program
-    .command("list")
-    .description("list available components inside the tarball")
-    .action(async function () {
-        const { assetsDir, tarballName } = this._globalOpts
-        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
-        if (!assets) {
-            console.error(chalk.red("Assets/ folder not found. Are you inside a Unity project?"))
-            process.exit(1)
-        }
-        const tarPath = findTarball(assets, tarballName)
-        if (!tarPath) {
-            console.error(
-                chalk.red(`Tarball '${tarballName}' not found under Assets/. Did you import the OneJS package?`)
-            )
-            process.exit(1)
-        }
-        const comps = await scanComponents(tarPath)
-        console.log(chalk.bold(`Components in ${path.relative(process.cwd(), tarPath)}:`))
-        comps.forEach((c) => console.log("  •", chalk.cyan(c)))
-    })
-
-/* ─────────────────────────────── doctor ─────────────────────────────── */
-
-program
-    .command("doctor")
-    .description("check Assets directory and tarball presence")
-    .action(async function () {
-        const { assetsDir, tarballName } = this._globalOpts
-        const spinner = ora("Checking environment").start()
-        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
-        if (!assets) {
-            spinner.fail("Assets/ folder not found")
-            process.exit(1)
-        }
-        const tarPath = findTarball(assets, tarballName)
-        if (!tarPath) {
-            spinner.fail(`Tarball '${tarballName}' not found under Assets/`)
-            process.exit(1)
-        }
-        spinner.succeed("Environment OK")
-        console.log(`Assets folder : ${chalk.green(path.relative(process.cwd(), assets))}`)
-        console.log(`Tarball       : ${chalk.green(path.relative(process.cwd(), tarPath))}`)
-    })
-
-/* ─────────────────────────────── add ─────────────────────────────── */
-
-program
-    .command("add")
-    .argument("<names...>", "component names to add, or 'all'")
-    .description("add components into ./comps")
-    .action(async function (names) {
-        const { yes, dry, assetsDir, tarballName } = this._globalOpts
-        const spinner = ora("Preparing").start()
-
-        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
-        if (!assets) {
-            spinner.fail("Assets/ folder not found")
-            process.exit(1)
-        }
-        const tarPath = findTarball(assets, tarballName)
-        if (!tarPath) {
-            spinner.fail(`Tarball '${tarballName}' not found`)
-            process.exit(1)
-        }
-
-        const allComps = await scanComponents(tarPath)
-        const targetAll = names.length === 1 && names[0] === "all"
-        const targets = targetAll ? Array.from(allComps) : names
-
-        // validate unknown comps
-        const unknown = targets.filter((c) => !allComps.has(c))
-        if (unknown.length) {
-            spinner.fail(`Unknown component(s): ${unknown.join(", ")}`)
-            process.exit(1)
-        }
-
-        const cwd = process.cwd()
-        const compsRoot = path.join(cwd, "comps")
-        fs.mkdirSync(compsRoot, { recursive: true })
-
-        // conflict detect
-        const NO_PROMPT = new Set(["LICENSE"])
-        const conflicts = targets.filter(
-            (comp) => !NO_PROMPT.has(comp) && fs.existsSync(path.join(compsRoot, comp))
-        )
-        spinner.stop()
-
-        if (conflicts.length && !yes) {
-            for (const c of conflicts) {
-                const ok = await askYN(
-                    `Overwrite existing ${chalk.yellow(`comps/${c}`)}? (backup your changes first)`
-                )
-                if (!ok) {
-                    console.log(chalk.yellow("Aborted."))
-                    process.exit(0)
-                }
-            }
-        }
-
-        if (dry) {
-            console.log(chalk.green("Dry-run: would install"), targets.join(", "))
-            process.exit(0)
-        }
-
-        const extractSpinner = ora("Extracting components").start()
-
-        const filter = (p) => {
-            if (!p.startsWith("comps/")) return false
-            const [, comp] = p.split("/")
-            return targetAll || targets.includes(comp)
-        }
-
-        try {
-            await tar.x({ file: tarPath, cwd, gzip: true, filter })
-            extractSpinner.succeed("Done.")
-        } catch (err) {
-            extractSpinner.fail("Extraction failed")
-            console.error(err)
-            process.exit(1)
-        }
-    })
-
-/* ─────────────────────────────── go ─────────────────────────────── */
-
-program.parseAsync().catch((err) => {
-    console.error(err)
-    process.exit(1)
+/* eslint-disable no-console */
+"use strict"
+
+/*
+ * OneJS – oj (shadcn-style) CLI
+ * A small utility for listing / installing premade UI components
+ * shipped inside a <Assets/> Unity project folder.
+ *
+ * Commands:
+ *   oj list                       – show available components inside tarball
+ *   oj add <name … | all>         – install one or many components
+ *   oj doctor                     – verify environment (Assets folder + tarball)
+ *
+ * Global flags:
+ *   -y, --yes, --force            – skip overwrite prompts
+ *   --dry                         – dry-run (no filesystem writes)
+ *   --assets-dir <dir>            – override Assets directory auto-detection
+ *   --tarball <file>              – override tarball filename (default premade-uis.tgz.bytes)
+ */
+
+const fs = require("fs")
+const path = require("path")
+const readline = require("readline")
+const tar = require("tar")
+const { Command } = require("commander")
+const chalk = require("chalk")
+const ora = require("ora")
+
+const pkg = require("../package.json")
+
+/* ─────────────────────────────── utils ─────────────────────────────── */
+
+function findAssetsDir(startDir, explicit) {
+    if (explicit) {
+        if (fs.existsSync(explicit) && fs.statSync(explicit).isDirectory()) return explicit
+        return null
+    }
+    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")
+        if (fs.existsSync(probe) && fs.statSync(probe).isDirectory()) return probe
+        dir = path.dirname(dir)
+    }
+    return null
+}
+
+function findTarball(assetsDir, tarballName) {
+    const stack = [assetsDir]
+    while (stack.length) {
+        const curr = stack.pop()
+        for (const e of fs.readdirSync(curr, { withFileTypes: true })) {
+            const p = path.join(curr, e.name)
+            if (e.isDirectory()) {
+                stack.push(p)
+            } else if (e.isFile() && e.name === tarballName) {
+                return p
+            }
+        }
+    }
+    return null
+}
+
+async function askYN(prompt) {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+        rl.question(`${prompt} ${chalk.dim("[y/N]")} `, (ans) => {
+            rl.close()
+            resolve(/^(y|yes)$/i.test(ans.trim()))
+        })
+    })
+}
+
+/**
+ * Return Set of top-level component folders inside tarball.
+ */
+async function scanComponents(tarPath) {
+    const comps = new Set()
+    await tar.t({
+        file: tarPath,
+        onentry: (entry) => {
+            const p = entry.path.replace(/\\/g, "/")
+            if (!p.startsWith("comps/")) return
+
+            // 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
+}
+
+/* ─────────────────────────────── commander ─────────────────────────────── */
+
+const program = new Command()
+
+program
+    .name("oj")
+    .description("OneJS premade UI component manager")
+    .version(pkg.version, "-v, --version", "print version")
+
+program
+    .hook("preAction", (thisCmd, actionCmd) => {
+        // Collect global opts and attach to actionCmd for convenience
+        actionCmd._globalOpts = {
+            yes: thisCmd.opts().yes || thisCmd.opts().force,
+            dry: thisCmd.opts().dry,
+            assetsDir: thisCmd.opts().assetsDir,
+            tarballName: thisCmd.opts().tarball || "premade-uis.tgz.bytes",
+        }
+    })
+    .option("-y, --yes", "skip confirmation prompts")
+    .option("--force", "alias for --yes")
+    .option("--dry", "dry-run – show actions only")
+    .option("--assets-dir <dir>", "override Assets/ directory")
+    .option("--tarball <file>", "override tarball filename (default premade-uis.tgz.bytes)")
+
+/* ─────────────────────────────── list ─────────────────────────────── */
+
+program
+    .command("list")
+    .description("list available components inside the tarball")
+    .action(async function () {
+        const { assetsDir, tarballName } = this._globalOpts
+        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
+        if (!assets) {
+            console.error(chalk.red("Assets/ folder not found. Are you inside a Unity project?"))
+            process.exit(1)
+        }
+        const tarPath = findTarball(assets, tarballName)
+        if (!tarPath) {
+            console.error(
+                chalk.red(`Tarball '${tarballName}' not found under Assets/. Did you import the OneJS package?`)
+            )
+            process.exit(1)
+        }
+        const comps = await scanComponents(tarPath)
+        console.log(chalk.bold(`Components in ${path.relative(process.cwd(), tarPath)}:`))
+        comps.forEach((c) => console.log("  •", chalk.cyan(c)))
+    })
+
+/* ─────────────────────────────── doctor ─────────────────────────────── */
+
+program
+    .command("doctor")
+    .description("check Assets directory and tarball presence")
+    .action(async function () {
+        const { assetsDir, tarballName } = this._globalOpts
+        const spinner = ora("Checking environment").start()
+        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
+        if (!assets) {
+            spinner.fail("Assets/ folder not found")
+            process.exit(1)
+        }
+        const tarPath = findTarball(assets, tarballName)
+        if (!tarPath) {
+            spinner.fail(`Tarball '${tarballName}' not found under Assets/`)
+            process.exit(1)
+        }
+        spinner.succeed("Environment OK")
+        console.log(`Assets folder : ${chalk.green(path.relative(process.cwd(), assets))}`)
+        console.log(`Tarball       : ${chalk.green(path.relative(process.cwd(), tarPath))}`)
+    })
+
+/* ─────────────────────────────── add ─────────────────────────────── */
+
+program
+    .command("add")
+    .argument("<names...>", "component names to add, or 'all'")
+    .description("add components into ./comps")
+    .action(async function (names) {
+        const { yes, dry, assetsDir, tarballName } = this._globalOpts
+        const spinner = ora("Preparing").start()
+
+        const assets = findAssetsDir(process.cwd(), assetsDir) || findAssetsDir(__dirname, assetsDir)
+        if (!assets) {
+            spinner.fail("Assets/ folder not found")
+            process.exit(1)
+        }
+        const tarPath = findTarball(assets, tarballName)
+        if (!tarPath) {
+            spinner.fail(`Tarball '${tarballName}' not found`)
+            process.exit(1)
+        }
+
+        const allComps = await scanComponents(tarPath)
+        const targetAll = names.length === 1 && names[0] === "all"
+        const targets = targetAll ? Array.from(allComps) : names
+
+        // validate unknown comps
+        const unknown = targets.filter((c) => !allComps.has(c))
+        if (unknown.length) {
+            spinner.fail(`Unknown component(s): ${unknown.join(", ")}`)
+            process.exit(1)
+        }
+
+        const cwd = process.cwd()
+        const compsRoot = path.join(cwd, "comps")
+        fs.mkdirSync(compsRoot, { recursive: true })
+
+        // conflict detect
+        const NO_PROMPT = new Set(["LICENSE"])
+        const conflicts = targets.filter(
+            (comp) => !NO_PROMPT.has(comp) && fs.existsSync(path.join(compsRoot, comp))
+        )
+        spinner.stop()
+
+        if (conflicts.length && !yes) {
+            for (const c of conflicts) {
+                const ok = await askYN(
+                    `Overwrite existing ${chalk.yellow(`comps/${c}`)}? (backup your changes first)`
+                )
+                if (!ok) {
+                    console.log(chalk.yellow("Aborted."))
+                    process.exit(0)
+                }
+            }
+        }
+
+        if (dry) {
+            console.log(chalk.green("Dry-run: would install"), targets.join(", "))
+            process.exit(0)
+        }
+
+        const extractSpinner = ora("Extracting components").start()
+
+        const filter = (p) => {
+            if (!p.startsWith("comps/")) return false
+            const [, comp] = p.split("/")
+            return targetAll || targets.includes(comp)
+        }
+
+        try {
+            await tar.x({ file: tarPath, cwd, gzip: true, filter })
+            extractSpinner.succeed("Done.")
+        } catch (err) {
+            extractSpinner.fail("Extraction failed")
+            console.error(err)
+            process.exit(1)
+        }
+    })
+
+/* ─────────────────────────────── go ─────────────────────────────── */
+
+program.parseAsync().catch((err) => {
+    console.error(err)
+    process.exit(1)
 })

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": "3.0.4",
+    "version": "3.0.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/Singtaa/onejs-core"
@@ -16,16 +16,17 @@
         "commander": "^11.0.0",
         "css-flatten": "^2.0.0",
         "css-simple-parser": "^3.0.0",
+        "fs-extra": "^11.2.0",
         "ora": "^5.4.1",
         "progress": "^2.0.3",
+        "rimraf": "^5.0.7",
         "tar": "^7.2.0"
     },
     "devDependencies": {
         "esbuild": "^0.20.0",
-        "fs-extra": "^11.2.0",
         "postcss": "^8.4.38",
         "postcss-cli": "^11.0.0",
-        "rimraf": "^5.0.7",
+        "postcss-import": "^16.1.1",
         "tailwindcss": "^3.4.17",
         "tiny-glob": "^0.2.9",
         "xml2js": "^0.6.2"

package/scripts/switch.cjs

@@ -147,12 +147,43 @@ async function getOneJSUnityDir() {
         }
     }
 
+    // Step 4: Check for embedded packages in Packages/ directory
+    const packagesDir = path.join(projectDir, 'Packages')
+    if (fs.existsSync(packagesDir)) {
+        for (const key of oneJSKeys) {
+            const embeddedPath = path.join(packagesDir, key)
+            if (fs.existsSync(embeddedPath) && fs.statSync(embeddedPath).isDirectory()) {
+                return embeddedPath
+            }
+        }
+    }
+
+    // Step 5: Parse .csproj to find OneJS path (handles packages in Assets/)
+    const csprojPath = path.join(projectDir, 'OneJS.Runtime.csproj')
+    if (fs.existsSync(csprojPath)) {
+        try {
+            const content = fs.readFileSync(csprojPath, 'utf8')
+            const match = content.match(/Include="([^"]*?[/\\]Runtime[/\\]Engine[/\\]ScriptEngine\.cs)"/)
+            if (match) {
+                const includePath = match[1].replace(/\\/g, '/')
+                const idx = includePath.indexOf('/Runtime/Engine/ScriptEngine.cs')
+                if (idx !== -1) {
+                    return path.resolve(projectDir, includePath.substring(0, idx))
+                }
+            }
+        } catch (err) {
+            // .csproj not readable, skip
+        }
+    }
+
     console.error(
         'Could not find OneJS package directory.\n' +
         'Please make sure OneJS is installed in your Unity project via one of:\n' +
         '  - A local path (file:) dependency in Packages/manifest.json\n' +
         '  - A Git URL dependency in Packages/manifest.json\n' +
         '  - The Unity Package Manager registry\n' +
+        '  - An embedded package in the Packages/ directory\n' +
+        '  - A package in the Assets/ directory (requires Unity to generate .csproj files)\n' +
         'And that this script is run from the OneJS npm project inside the Unity project.'
     )
     return null

package/dist/csharp/index.d.ts

@@ -1,3 +0,0 @@
-export declare function newArray<T>(type: {
-    new (): T;
-}, count: any): CS.System.Array;

package/dist/csharp/index.js

@@ -1,3 +0,0 @@
-export function newArray(type, count) {
-    return CS.System.Array.CreateInstance(puer.$typeof(type), count);
-}

package/dist/utils/responsive.d.ts

@@ -1,4 +0,0 @@
-export type Breakpoint = "base" | "xs" | "sm" | "md" | "lg" | "xl";
-export type Responsive = number | Partial<Record<Breakpoint, number>>;
-/** Pick the right value for the current width. */
-export declare function resolveResponsive<T>(val: Responsive, w?: number): number;

package/dist/utils/responsive.js

@@ -1,23 +0,0 @@
-const BP = {
-    xs: 480,
-    sm: 640,
-    md: 768,
-    lg: 1024,
-    xl: 1280,
-};
-/** Current viewport width (UI Toolkit) */
-const getWidth = () => document.body.ve.resolvedStyle.width;
-/** Pick the right value for the current width. */
-export function resolveResponsive(val, w = getWidth()) {
-    if (typeof val !== "object")
-        return val;
-    let picked = val.base;
-    for (const [bp, px] of Object.entries(BP)) {
-        if (w >= px && val[bp] !== undefined)
-            picked = val[bp];
-    }
-    setTimeout(() => {
-        console.log(CS.UnityEngine.Screen.dpi);
-    }, 1);
-    return picked;
-}

package/dist/utils/toJsArray.d.ts

@@ -1 +0,0 @@
-export declare function toJsArray(csArr: any): any[];

package/dist/utils/toJsArray.js

@@ -1,10 +0,0 @@
-export function toJsArray(csArr) {
-    if (!csArr)
-        return [];
-    let arr = new Array(csArr.Length);
-    var i = csArr.Length;
-    while (i--) {
-        arr[i] = csArr.get_Item(i);
-    }
-    return arr;
-}