onejs-core 2.0.3 → 2.0.5

package/bin/oj.js

@@ -1,3 +1,131 @@
 #!/usr/bin/env node
+"use strict"
 
-console.log("init")
+const fs = require("fs")
+const path = require("path")
+const zlib = require("zlib")
+const readline = require("readline")
+const tar = require("tar")
+
+/* ───────────── helpers ───────────── */
+
+function findAssetsDir(startDir) {
+    let dir = startDir
+    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) {
+    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 === "premade-uis.tgz.bytes") return p
+        }
+    }
+    return null
+}
+
+function askYN(prompt) {
+    return new Promise(resolve => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+        rl.question(`${prompt} [y/N] `, ans => {
+            rl.close()
+            resolve(/^(y|yes)$/i.test(ans.trim()))
+        })
+    })
+}
+
+/* ───────────── main ───────────── */
+
+(async () => {
+    const [, , cmd, target] = process.argv
+
+    if (cmd !== "add" || !target) {
+        console.error("Usage: npx oj add <all|name>")
+        process.exit(1)
+    }
+
+    const assetsDir = findAssetsDir(process.cwd()) || findAssetsDir(__dirname)
+    if (!assetsDir) {
+        console.error("Assets/ folder not found in any ancestor directory. Make sure you are in a Unity project but outside the Assets/ folder.")
+        process.exit(1)
+    }
+
+    const tarPath = findTarball(assetsDir)
+    if (!tarPath) {
+        console.error("premade-uis.tgz not found. It's included in the OneJS Asset Store package. So make sure you have that installed somewhere under the Assets/ folder.")
+        process.exit(1)
+    }
+
+    const cwd = process.cwd()
+    const compsRoot = path.join(cwd, "comps")
+    fs.mkdirSync(compsRoot, { recursive: true })
+
+    /* ── dry-run to detect conflicts ── */
+    const conflictKeys = new Set()
+
+    await tar.t({
+        file: tarPath,
+        onentry: entry => {
+            const p = entry.path
+            if (!p.startsWith("comps/")) return
+
+            if (target !== "all") {
+                const rootFile = p.split("/").length === 2
+                const inTarget = p === `comps/${target}` || p.startsWith(`comps/${target}/`)
+                if (!rootFile && !inTarget) return
+
+                const dest = path.join(cwd, p)
+                if (fs.existsSync(dest)) {
+                    conflictKeys.add(rootFile ? p : `comps/${target}`)
+                }
+                return
+            }
+
+            // ── "all" mode ──
+            // Ask once per top-level folder (comps/echo, comps/casaul, ...)
+            const topLevel = p.split("/").slice(0, 2).join("/")
+            const dest = path.join(cwd, topLevel)
+            if (fs.existsSync(dest)) conflictKeys.add(topLevel)
+        }
+    })
+
+    for (const key of conflictKeys) {
+        const ok = await askYN(`Overwrite existing ${key}?`)
+        if (!ok) {
+            console.log("Aborted.")
+            process.exit(0)
+        }
+    }
+
+    /* ── real extraction ── */
+    const filter = p => {
+        if (!p.startsWith("comps/")) return false
+        if (target === "all") return true
+
+        const rootFile = p.split("/").length === 2
+        return rootFile || p === `comps/${target}` || p.startsWith(`comps/${target}/`)
+    }
+
+    await tar.x({
+        file: tarPath,
+        cwd,
+        gzip: true,
+        filter
+    })
+
+    console.log("Done.")
+})().catch(err => {
+    console.error(err)
+    process.exit(1)
+})

package/definitions/globals.d.ts

@@ -1,13 +1,18 @@
-declare namespace OneJS {
-    class Event<F extends Function> {
-        // Must have at least an unique member, because an empty class behaves like `any`
-        #Invoke(...args: any): any
-    }
-
-    type EventKeys<T> = { [k in keyof T]-?: T[k] extends Event<any> ? k : never }[keyof T]
-
-    type EventGenericType<T> = T extends Event<infer F> ? F : never
-}
+type Instance<T> = T extends new (...a: any) => infer I ? I : never
+
+type EventNames<T> = {
+    [K in keyof T]:
+    K extends `add_${infer E}`
+    ? `remove_${E}` extends keyof T ? E : never
+    : never
+}[keyof T]
+
+type Handler<T, E extends string> =
+    `add_${E}` extends keyof T
+    ? T[`add_${E}`] extends (arg: infer A) => any
+    ? A
+    : never
+    : never
 
 declare const onejs: {
     add_onReload(handler: () => void): void
@@ -20,10 +25,20 @@ declare const onejs: {
     //     objects: Record<string, any>
     // }
 
-    subscribe<T, K extends OneJS.EventKeys<T>>(
+    subscribe<T, K extends EventNames<T>>(
         eventSource: T,
         eventName: K,
-        handler: OneJS.EventGenericType<T[K]>
+        handler: Function
+    ): CS.System.Action
+
+    subscribe<
+        C extends new (...a: any) => any,
+        I extends Instance<C>,
+        E extends EventNames<I>
+    >(
+        eventSource: C,
+        eventName: E,
+        handler: Function
     ): CS.System.Action
 
     subscribe(eventName: string, handler: () => void): CS.System.Action

package/dist/utils/responsive.d.ts

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,23 @@
+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/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.3",
+    "version": "2.0.5",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "bin": {

package/scripts/postcss/onejs-tw-config.cjs

@@ -30,6 +30,9 @@ exports.plugins = [
             ".wrap": {
                 "white-space": "normal",
             },
+            ".font-bold": {
+                "-unity-font-style": "bold",
+            },
             ".bold": {
                 "-unity-font-style": "bold",
             },

package/tsconfig.json

@@ -9,6 +9,7 @@
         "jsxFactory": "h",
         "jsxFragmentFactory": "Fragment",
         "skipLibCheck": false,
+        "strictNullChecks": true,
         "forceConsistentCasingInFileNames": true,
         "declaration": true,
         "typeRoots": [ ],