onejs-core 3.0.3 → 3.0.5

package/package.json

@@ -1,33 +1,34 @@
-{
-    "name": "onejs-core",
-    "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "3.0.3",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Singtaa/onejs-core"
-    },
-    "main": "./dist/index.js",
-    "types": "./typings.d.ts",
-    "bin": {
-        "oj": "./bin/oj.js"
-    },
-    "dependencies": {
-        "chalk": "^4.1.2",
-        "commander": "^11.0.0",
-        "css-flatten": "^2.0.0",
-        "css-simple-parser": "^3.0.0",
-        "ora": "^5.4.1",
-        "progress": "^2.0.3",
-        "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",
-        "tailwindcss": "^3.4.17",
-        "tiny-glob": "^0.2.9",
-        "xml2js": "^0.6.2"
-    }
-}
+{
+    "name": "onejs-core",
+    "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
+    "version": "3.0.5",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Singtaa/onejs-core"
+    },
+    "main": "./dist/index.js",
+    "types": "./typings.d.ts",
+    "bin": {
+        "oj": "./bin/oj.js"
+    },
+    "dependencies": {
+        "chalk": "^4.1.2",
+        "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",
+        "postcss": "^8.4.38",
+        "postcss-cli": "^11.0.0",
+        "postcss-import": "^16.1.1",
+        "tailwindcss": "^3.4.17",
+        "tiny-glob": "^0.2.9",
+        "xml2js": "^0.6.2"
+    }
+}

package/preloads/inject.ts

@@ -1,44 +1,44 @@
-/// <reference path="../definitions/index.d.ts" />
-
-export function btoa(text: string): string {
-	// return CS.OneJS.CommonGlobals.btoa(text);
-	const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-	let str = text;
-	let output = '';
-
-	for (let i = 0; i < str.length; i += 3) {
-		let block = (str.charCodeAt(i) << 16) | ((i + 1 < str.length ? str.charCodeAt(i + 1) : 0) << 8) | (i + 2 < str.length ? str.charCodeAt(i + 2) : 0);
-		output += chars[(block >> 18) & 0x3F] +
-			chars[(block >> 12) & 0x3F] +
-			(i + 1 < str.length ? chars[(block >> 6) & 0x3F] : '=') +
-			(i + 2 < str.length ? chars[block & 0x3F] : '=');
-	}
-
-	return output;
-}
-
-// function uint8ArrayToString(uint8Array) {
-//     const chars: any = [];
-//     for (let i = 0; i < uint8Array.length; i++) {
-//         chars.push(String.fromCharCode(uint8Array[i]));
-//     }
-//     return chars.join('');
-// }
-
-export function atob(base64: string): string {
-	// return CS.OneJS.CommonGlobals.atob(base64);
-	// return CS.System.Text.Encoding.UTF8.GetString(CS.System.Convert.FromBase64String(base64))
-	const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-	let str = base64.replace(/=+$/, '');
-	let output = '';
-
-	if (str.length % 4 == 1) {
-		throw new Error('Invalid base64 string');
-	}
-
-	for (let bc = 0, bs = 0, buffer, idx = 0; buffer = str.charAt(idx++); ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer, bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0) {
-		buffer = chars.indexOf(buffer);
-	}
-
-	return output;
+/// <reference path="../definitions/index.d.ts" />
+
+export function btoa(text: string): string {
+	// return CS.OneJS.CommonGlobals.btoa(text);
+	const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+	let str = text;
+	let output = '';
+
+	for (let i = 0; i < str.length; i += 3) {
+		let block = (str.charCodeAt(i) << 16) | ((i + 1 < str.length ? str.charCodeAt(i + 1) : 0) << 8) | (i + 2 < str.length ? str.charCodeAt(i + 2) : 0);
+		output += chars[(block >> 18) & 0x3F] +
+			chars[(block >> 12) & 0x3F] +
+			(i + 1 < str.length ? chars[(block >> 6) & 0x3F] : '=') +
+			(i + 2 < str.length ? chars[block & 0x3F] : '=');
+	}
+
+	return output;
+}
+
+// function uint8ArrayToString(uint8Array) {
+//     const chars: any = [];
+//     for (let i = 0; i < uint8Array.length; i++) {
+//         chars.push(String.fromCharCode(uint8Array[i]));
+//     }
+//     return chars.join('');
+// }
+
+export function atob(base64: string): string {
+	// return CS.OneJS.CommonGlobals.atob(base64);
+	// return CS.System.Text.Encoding.UTF8.GetString(CS.System.Convert.FromBase64String(base64))
+	const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+	let str = base64.replace(/=+$/, '');
+	let output = '';
+
+	if (str.length % 4 == 1) {
+		throw new Error('Invalid base64 string');
+	}
+
+	for (let bc = 0, bs = 0, buffer, idx = 0; buffer = str.charAt(idx++); ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer, bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0) {
+		buffer = chars.indexOf(buffer);
+	}
+
+	return output;
 }

package/scripts/esbuild/copy-assets.mjs

@@ -1,95 +1,95 @@
-/**
- * Contains code from Nick Janetakis's esbuild-copy-static-files (MIT)
- */
-import path from 'path'
-import fs from 'fs'
-import crypto from 'crypto'
-
-function getPackagesWithAssets() {
-    let packagesWithAssets = [];
-    const nodeModulesPath = path.join(process.cwd(), 'node_modules');
-    const packages = fs.readdirSync(nodeModulesPath);
-    // console.log("There are " + packages.length + " packages in node_modules");
-    for (const packageName of packages) {
-        const packagePath = path.join(nodeModulesPath, packageName);
-        if (!fs.statSync(packagePath).isDirectory())
-            continue;
-        const pkgJsonPath = path.join(packagePath, 'package.json');
-
-        try {
-            const pkgJsonContent = fs.readFileSync(pkgJsonPath, 'utf8');
-            const pkgJson = JSON.parse(pkgJsonContent);
-
-            if (pkgJson.onejs && pkgJson.onejs['assets-path']) {
-
-                packagesWithAssets.push({
-                    name: packageName,
-                    src: path.join("node_modules", packageName, pkgJson.onejs['assets-path'])
-                });
-            }
-        } catch (error) {
-            if (error.code !== 'ENOENT') {
-                console.error(`Error processing ${packageName}:`, error);
-            }
-        }
-    }
-
-    // console.log("Found " + packagesWithAssets.length + " packages with assets");
-    return packagesWithAssets
-}
-
-const getDigest = (string) => {
-    const hash = crypto.createHash('md5')
-    const data = hash.update(string, 'utf-8')
-
-    return data.digest('hex')
-}
-
-const getFileDigest = (path) => {
-    if (!fs.existsSync(path)) {
-        return null
-    }
-
-    if (fs.statSync(path).isDirectory()) {
-        return null
-    }
-
-    return getDigest(fs.readFileSync(path))
-}
-
-function filter(src, dest) {
-    if (!fs.existsSync(dest)) {
-        return true
-    }
-
-    if (fs.statSync(dest).isDirectory()) {
-        return true
-    }
-
-    return getFileDigest(src) !== getFileDigest(dest)
-}
-
-export function copyAssetsPlugin(options = {}) {
-    let dest = options.dest || 'assets'
-    return {
-        name: "onejs-copy-assets",
-        setup(build) {
-            build.onEnd(async () => {
-                const packagesWithAssets = getPackagesWithAssets();
-                console.log(`[esbuild] syncing assets from:`)
-                for (const pkg of packagesWithAssets) {
-                    const destPath = path.join(dest, "@" + pkg.name);
-                    fs.cpSync(pkg.src, destPath, {
-                        dereference: options.dereference || true,
-                        errorOnExist: options.errorOnExist || false,
-                        filter: options.filter || filter,
-                        force: options.force || true,
-                        preserveTimestamps: options.preserveTimestamps || true,
-                        recursive: options.recursive || true,
-                    })
-                    console.log(`[esbuild] > ${pkg.name}`)
-                }
-            })
-        }
-    }
+/**
+ * Contains code from Nick Janetakis's esbuild-copy-static-files (MIT)
+ */
+import path from 'path'
+import fs from 'fs'
+import crypto from 'crypto'
+
+function getPackagesWithAssets() {
+    let packagesWithAssets = [];
+    const nodeModulesPath = path.join(process.cwd(), 'node_modules');
+    const packages = fs.readdirSync(nodeModulesPath);
+    // console.log("There are " + packages.length + " packages in node_modules");
+    for (const packageName of packages) {
+        const packagePath = path.join(nodeModulesPath, packageName);
+        if (!fs.statSync(packagePath).isDirectory())
+            continue;
+        const pkgJsonPath = path.join(packagePath, 'package.json');
+
+        try {
+            const pkgJsonContent = fs.readFileSync(pkgJsonPath, 'utf8');
+            const pkgJson = JSON.parse(pkgJsonContent);
+
+            if (pkgJson.onejs && pkgJson.onejs['assets-path']) {
+
+                packagesWithAssets.push({
+                    name: packageName,
+                    src: path.join("node_modules", packageName, pkgJson.onejs['assets-path'])
+                });
+            }
+        } catch (error) {
+            if (error.code !== 'ENOENT') {
+                console.error(`Error processing ${packageName}:`, error);
+            }
+        }
+    }
+
+    // console.log("Found " + packagesWithAssets.length + " packages with assets");
+    return packagesWithAssets
+}
+
+const getDigest = (string) => {
+    const hash = crypto.createHash('md5')
+    const data = hash.update(string, 'utf-8')
+
+    return data.digest('hex')
+}
+
+const getFileDigest = (path) => {
+    if (!fs.existsSync(path)) {
+        return null
+    }
+
+    if (fs.statSync(path).isDirectory()) {
+        return null
+    }
+
+    return getDigest(fs.readFileSync(path))
+}
+
+function filter(src, dest) {
+    if (!fs.existsSync(dest)) {
+        return true
+    }
+
+    if (fs.statSync(dest).isDirectory()) {
+        return true
+    }
+
+    return getFileDigest(src) !== getFileDigest(dest)
+}
+
+export function copyAssetsPlugin(options = {}) {
+    let dest = options.dest || 'assets'
+    return {
+        name: "onejs-copy-assets",
+        setup(build) {
+            build.onEnd(async () => {
+                const packagesWithAssets = getPackagesWithAssets();
+                console.log(`[esbuild] syncing assets from:`)
+                for (const pkg of packagesWithAssets) {
+                    const destPath = path.join(dest, "@" + pkg.name);
+                    fs.cpSync(pkg.src, destPath, {
+                        dereference: options.dereference || true,
+                        errorOnExist: options.errorOnExist || false,
+                        filter: options.filter || filter,
+                        force: options.force || true,
+                        preserveTimestamps: options.preserveTimestamps || true,
+                        recursive: options.recursive || true,
+                    })
+                    console.log(`[esbuild] > ${pkg.name}`)
+                }
+            })
+        }
+    }
 }

package/scripts/esbuild/decorator-fix.mjs

@@ -1,18 +1,18 @@
-import fs from 'fs'
-
-export function decoratorFixPlugin(options = {}) {
-    const outfile = options.outfile || "@outputs/esbuild/app.js"
-    return {
-        name: "decorator-fix-plugin",
-        setup(build) {
-            build.onEnd(() => {
-                let content = fs.readFileSync(outfile, "utf8")
-                content = content.replace(
-                    /exports\s*&&\s*exports\.__decorate/g,
-                    'typeof exports !== "undefined" && exports.__decorate'
-                )
-                fs.writeFileSync(outfile, content, "utf8")
-            })
-        }
-    }
+import fs from 'fs'
+
+export function decoratorFixPlugin(options = {}) {
+    const outfile = options.outfile || "@outputs/esbuild/app.js"
+    return {
+        name: "decorator-fix-plugin",
+        setup(build) {
+            build.onEnd(() => {
+                let content = fs.readFileSync(outfile, "utf8")
+                content = content.replace(
+                    /exports\s*&&\s*exports\.__decorate/g,
+                    'typeof exports !== "undefined" && exports.__decorate'
+                )
+                fs.writeFileSync(outfile, content, "utf8")
+            })
+        }
+    }
 }

package/scripts/esbuild/import-transform.mjs

@@ -1,101 +1,101 @@
-import * as fs from "fs";
-import * as path from "path";
-
-/**
- * An esbuild plugin that transforms imports from modules starting with a capital letter.
- * 
- * ## Functionality:
- * 1. **Externalizing Capitalized Module Imports**:
- *    - Marks imports from modules with names starting with a capital letter as external
- *      during the resolution phase.
- * 
- * 2. **Transforming Import Statements**:
- *    - Rewrites ES module import statements to reference a global `CS` object.
- *    - Converts:
- *      ```js
- *      import { Foo, Bar } from "MyModule";
- *      ```
- *      Into:
- *      ```js
- *      const { Foo, Bar } = CS.MyModule;
- *      ```
- *    - If the import is a default import or namespace import:
- *      ```js
- *      import MyModule from "MyModule";
- *      ```
- *      Becomes:
- *      ```js
- *      const MyModule = CS.MyModule;
- *      ```
- * 
- * 3. **Handling `require` Statements**:
- *    - Transforms `__require("MyModule")` into `CS.MyModule`.
- * 
- * ## Parameters:
- * @param {Object} options - Configuration options.
- * @param {Function} [options.moduleFilter] - A filter function that determines if a module should be transformed.
- * 
- * ## Returns:
- * @returns {Object} An esbuild plugin object.
- * 
- * ## Example Usage:
- * 
- * ```js
- * importTransformation({
- *     moduleFilter: (moduleName) => moduleName.startsWith("MyLib")
- * });
- * ```
- * 
- */
-export function importTransformationPlugin(options = {}) {
-    const moduleFilter = options.moduleFilter || (() => true);
-    return {
-        name: "onejs-import-transform",
-        setup(build) {
-            // First pass: Mark imports from modules starting with a capital letter as external
-            build.onResolve({ filter: /^[A-Z]/ }, (args) => {
-                return { path: args.path, external: true };
-            });
-
-            // Second pass: Transform all JS and TSX files
-            build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, async (args) => {
-                let contents = await fs.promises.readFile(args.path, "utf8");
-
-                // Transform imports from modules starting with a capital letter
-                contents = contents.replace(
-                    /import\s+(?:{([^}]+)})?\s*from\s*["']([A-Z][^"']*)["'];?/g,
-                    (match, imports, moduleName) => {
-                        if (!moduleFilter(moduleName))
-                            return match;
-                        moduleName = moduleName.replace(/\//g, ".");
-                        if (imports) {
-                            const importItems = imports.split(",").map((item) => item.trim());
-                            return `const { ${importItems.join(", ")} } = CS.${moduleName};`;
-                        } else {
-                            const namespaceName = moduleName.split(".").pop();
-                            return `const ${namespaceName} = CS.${moduleName};`;
-                        }
-                    }
-                );
-
-                // Transform any remaining require statements for such modules
-                contents = contents.replace(
-                    /__require\(["']([A-Z][^"']*)["']\)/g,
-                    (match, moduleName) => {
-                        if (!moduleFilter(moduleName))
-                            return match;
-                        return `CS.${moduleName.replace(/\//g, ".")}`;
-                    }
-                );
-
-                return { contents, loader: path.extname(args.path).slice(1) };
-            });
-        },
-    };
-}
-
-/**
- * Keeping for backward-compatibility reasons. Please use `importTransformationPlugin()` instead.
- */
-export const importTransformation = importTransformationPlugin;
+import * as fs from "fs";
+import * as path from "path";
+
+/**
+ * An esbuild plugin that transforms imports from modules starting with a capital letter.
+ * 
+ * ## Functionality:
+ * 1. **Externalizing Capitalized Module Imports**:
+ *    - Marks imports from modules with names starting with a capital letter as external
+ *      during the resolution phase.
+ * 
+ * 2. **Transforming Import Statements**:
+ *    - Rewrites ES module import statements to reference a global `CS` object.
+ *    - Converts:
+ *      ```js
+ *      import { Foo, Bar } from "MyModule";
+ *      ```
+ *      Into:
+ *      ```js
+ *      const { Foo, Bar } = CS.MyModule;
+ *      ```
+ *    - If the import is a default import or namespace import:
+ *      ```js
+ *      import MyModule from "MyModule";
+ *      ```
+ *      Becomes:
+ *      ```js
+ *      const MyModule = CS.MyModule;
+ *      ```
+ * 
+ * 3. **Handling `require` Statements**:
+ *    - Transforms `__require("MyModule")` into `CS.MyModule`.
+ * 
+ * ## Parameters:
+ * @param {Object} options - Configuration options.
+ * @param {Function} [options.moduleFilter] - A filter function that determines if a module should be transformed.
+ * 
+ * ## Returns:
+ * @returns {Object} An esbuild plugin object.
+ * 
+ * ## Example Usage:
+ * 
+ * ```js
+ * importTransformation({
+ *     moduleFilter: (moduleName) => moduleName.startsWith("MyLib")
+ * });
+ * ```
+ * 
+ */
+export function importTransformationPlugin(options = {}) {
+    const moduleFilter = options.moduleFilter || (() => true);
+    return {
+        name: "onejs-import-transform",
+        setup(build) {
+            // First pass: Mark imports from modules starting with a capital letter as external
+            build.onResolve({ filter: /^[A-Z]/ }, (args) => {
+                return { path: args.path, external: true };
+            });
+
+            // Second pass: Transform all JS and TSX files
+            build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, async (args) => {
+                let contents = await fs.promises.readFile(args.path, "utf8");
+
+                // Transform imports from modules starting with a capital letter
+                contents = contents.replace(
+                    /import\s+(?:{([^}]+)})?\s*from\s*["']([A-Z][^"']*)["'];?/g,
+                    (match, imports, moduleName) => {
+                        if (!moduleFilter(moduleName))
+                            return match;
+                        moduleName = moduleName.replace(/\//g, ".");
+                        if (imports) {
+                            const importItems = imports.split(",").map((item) => item.trim());
+                            return `const { ${importItems.join(", ")} } = CS.${moduleName};`;
+                        } else {
+                            const namespaceName = moduleName.split(".").pop();
+                            return `const ${namespaceName} = CS.${moduleName};`;
+                        }
+                    }
+                );
+
+                // Transform any remaining require statements for such modules
+                contents = contents.replace(
+                    /__require\(["']([A-Z][^"']*)["']\)/g,
+                    (match, moduleName) => {
+                        if (!moduleFilter(moduleName))
+                            return match;
+                        return `CS.${moduleName.replace(/\//g, ".")}`;
+                    }
+                );
+
+                return { contents, loader: path.extname(args.path).slice(1) };
+            });
+        },
+    };
+}
+
+/**
+ * Keeping for backward-compatibility reasons. Please use `importTransformationPlugin()` instead.
+ */
+export const importTransformation = importTransformationPlugin;
 export const importTransformPlugin = importTransformationPlugin();

package/scripts/esbuild/index.mjs

@@ -1,4 +1,4 @@
-export * from "./import-transform.mjs"
-export * from "./watch-output.mjs"
-export * from "./copy-assets.mjs"
+export * from "./import-transform.mjs"
+export * from "./watch-output.mjs"
+export * from "./copy-assets.mjs"
 export * from "./decorator-fix.mjs"