@simplelocalize/cli 1.0.7 → 2.9.0-r1

package/README.md

@@ -0,0 +1,52 @@
+# SimpleLocalize CLI via npm
+
+The main goal of this project is to give fronted developers
+an easier way to use [SimpleLocalize CLI](https://github.com/simplelocalize/simplelocalize-cli)
+in their workflows. 
+
+## Installation
+
+```
+npm install @simplelocalize/cli@2.9.0
+```
+
+After installing the package, it should automatically choose the right binary for 
+your system and install it into `node_modules/.bin` directory, to make it available for your
+scripts in `package.json`.
+
+## Usage
+
+Package SimpleLocalize CLI in your project and makes it available in `package.json` scripts.
+
+
+```
+{
+  "name": "My project",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "@simplelocalize/cli": "^2.9.0",
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "sl:download": "simplelocalize download",
+    "sl:upload": "simplelocalize upload",
+    "sl:autotranslate": "simplelocalize auto-translate"
+  },
+}
+```
+
+Learn more about [SimpleLocalize CLI commands](https://github.com/simplelocalize/simplelocalize-cli)
+
+## Versioning explanation
+
+`@simplelocalize/cli` versioning is synced with https://github.com/simplelocalize/simplelocalize-cli versioning.
+
+`@simplelocalize/cli@{CLI_VERSION}-release.{NPM_VERSION}` is the versioning scheme used in this package.
+Where `CLI_VERSION` is the version of SimpleLocalize CLI and `NPM_VERSION` is the version of this npm package.
+
+`@simplelocalize/cli@2.9.0+1` will install SimpleLocalize CLI 2.9.0 and this npm package version is 1.
+`@simplelocalize/cli@2.9.0+2` will install SimpleLocalize CLI 2.9.0 and this npm package version is 2.
+
+By using this versioning scheme, we can release new versions of this npm package
+without changing the SimpleLocalize CLI version, for example, to fix bugs in this package.

package/index.cjs

@@ -1,114 +1,150 @@
-#!/usr/bin/env node
-const { execSync } = require("child_process");
-const path = require("path");
-const fs = require('fs');
-const axios = require('axios');
-const os = require('os');
-
-let binaryPath = path.join(__dirname, 'bin', 'simplelocalize');
-if (os.platform() === 'win32') {
-    binaryPath += '.exe';
-}
-
-const isBinaryInstalled = () => {
-    try {
-        execSync(binaryPath + ' --version', { stdio: 'ignore' });
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}
-
-const printBinaryVersion = () => {
-    try {
-        console.log(execSync(binaryPath + ' --version').toString());
-    }
-    catch (error) {
-        console.error('Error running SimpleLocalize CLI');
-        process.exit(1);
-    }
-}
-
-const buildDownloadBinaryUrl = (version) => {
-    let platform = "";
-    if (os.platform() === "win32") {
-        platform = "windows.exe"
-    }
-
-    if (os.platform() === "darwin") {
-        platform = "mac"
-    }
-
-    if (os.platform() === "linux") {
-        platform = "linux"
-    }
-
-    let arch = "";
-    if (os.arch() === "arm64") {
-        arch = "-arm64"
-    }
-    console.log(`Downloading SimpleLocalize CLI ${version} for ${platform}${arch}...`);
-    return `https://github.com/simplelocalize/simplelocalize-cli/releases/download/${version}/simplelocalize-cli-${platform}${arch}`
-}
-
-async function installBinary() {
-    const cliVersion = "2.8.0";
-    const downloadUrl = buildDownloadBinaryUrl(cliVersion);
-    if (!fs.existsSync(path.join(__dirname, 'bin'))) {
-        fs.mkdirSync(path.join(__dirname, 'bin'));
-    }
-
-    const response = await axios({
-        url: downloadUrl,
-        method: 'GET',
-        responseType: 'stream'
-    });
-
-    const writer = fs.createWriteStream(binaryPath);
-    response.data.pipe(writer);
-    await new Promise((resolve, reject) => {
-        writer.on('finish', resolve);
-        writer.on('error', reject);
-    });
-
-    // Make it executable (only on Unix-based systems)
-    if (os.platform() !== 'win32') {
-        console.log('Making binary executable...');
-        fs.chmodSync(binaryPath, 0o755);
-    }
-}
-
-const linkToNodeModulesBin = () => {
-    let nodeModulesBinPath = path.join(__dirname, '..', '..', '.bin', 'simplelocalize');
-    
-    if (os.platform() === 'win32') {
-        nodeModulesBinPath += '.exe';
-    }
-
-    if (fs.existsSync(nodeModulesBinPath)) {
-        fs.unlinkSync(nodeModulesBinPath);
-    }
-    fs.symlinkSync(binaryPath, nodeModulesBinPath);
-    console.log('Link to node_modules/.bin created.');
-}
-
-const init = async () => {
-    console.log("Checking if SimpleLocalize CLI is installed...");
-    if (!isBinaryInstalled()) {
-        console.log("SimpleLocalize CLI not installed. Installing...");
-        await installBinary();
-        if (!isBinaryInstalled()) {
-            console.error('Error installing SimpleLocalize CLI');
-            process.exit(1);
-        }
-        console.log("SimpleLocalize CLI installed successfully!");
-    } else {
-        console.log("SimpleLocalize CLI already installed.");
-    }
-    printBinaryVersion();
-    linkToNodeModulesBin();
-    process.exit(0);
-}
-
-init();
+#!/usr/bin/env node
+const { execSync } = require("child_process");
+const path = require("path");
+const fs = require('fs');
+const axios = require('axios');
+const os = require('os');
+
+let binaryPath = path.join(__dirname, 'bin', 'simplelocalize');
+if (os.platform() === 'win32') {
+    binaryPath += '.exe';
+}
+
+const getExpectedCliVersion = () => {
+    const packageVersion = require('./package.json').version;
+    return packageVersion.split('+')[0];
+};
+
+const isBinaryInstalled = () => {
+    try {
+        const output = execSync(binaryPath + ' --version').toString().trim();
+        const expectedVersion = getExpectedCliVersion();
+        return output.includes(expectedVersion);
+    }
+    catch (error) {
+        return false;
+    }
+}
+
+const printBinaryVersion = () => {
+    try {
+        console.log(execSync(binaryPath + ' --version').toString());
+    }
+    catch (error) {
+        console.error('Error running SimpleLocalize CLI');
+        process.exit(1);
+    }
+}
+
+const buildDownloadBinaryUrl = (version) => {
+    let platform = "";
+    if (os.platform() === "win32") {
+        platform = "windows.exe"
+    }
+
+    if (os.platform() === "darwin") {
+        platform = "mac"
+    }
+
+    if (os.platform() === "linux") {
+        platform = "linux"
+    }
+
+    let arch = "";
+    if (os.arch() === "arm64") {
+        arch = "-arm64"
+    }
+    console.log(`Downloading SimpleLocalize CLI ${version} for ${platform}${arch}...`);
+    return `https://get.simplelocalize.io/binaries/${version}/simplelocalize-cli-${platform}${arch}`
+}
+
+async function installBinary() {
+    const packageVersion = require('./package.json').version;
+    const cliVersion = packageVersion.split('-')[0];
+    const downloadUrl = buildDownloadBinaryUrl(cliVersion);
+    if (!fs.existsSync(path.join(__dirname, 'bin'))) {
+        fs.mkdirSync(path.join(__dirname, 'bin'));
+    }
+
+    const response = await axios({
+        url: downloadUrl,
+        method: 'GET',
+        responseType: 'stream'
+    });
+
+    const writer = fs.createWriteStream(binaryPath);
+    response.data.pipe(writer);
+    await new Promise((resolve, reject) => {
+        writer.on('finish', resolve);
+        writer.on('error', reject);
+    });
+
+    // Make it executable (only on Unix-based systems)
+    if (os.platform() !== 'win32') {
+        console.log('Making binary executable...');
+        fs.chmodSync(binaryPath, 0o755);
+    }
+}
+
+const linkToNodeModulesBin = () => {
+    let nodeModulesBinPath = path.join(__dirname, '..', '..', '.bin', 'simplelocalize');
+    
+    if (os.platform() === 'win32') {
+        nodeModulesBinPath += '.exe';
+    }
+
+    // Ensure the .bin directory exists
+    const binDir = path.dirname(nodeModulesBinPath);
+    if (!fs.existsSync(binDir)) {
+        fs.mkdirSync(binDir, { recursive: true });
+    }
+
+    if (fs.existsSync(nodeModulesBinPath)) {
+        fs.unlinkSync(nodeModulesBinPath);
+    }
+    fs.symlinkSync(binaryPath, nodeModulesBinPath);
+    console.log('Link to node_modules/.bin created.');
+}
+
+const init = async () => {
+    console.log("Checking if SimpleLocalize CLI is installed...");
+    if (!isBinaryInstalled()) {
+        console.log("SimpleLocalize CLI not installed. Installing...");
+        await installBinary();
+        if (!isBinaryInstalled()) {
+            console.error('Error installing SimpleLocalize CLI');
+            process.exit(1);
+        }
+        console.log("SimpleLocalize CLI installed successfully!");
+    } else {
+        console.log("SimpleLocalize CLI already installed.");
+    }
+    printBinaryVersion();
+    linkToNodeModulesBin();
+    process.exit(0);
+}
+
+// Only run install logic if called with 'install' argument (for postinstall)
+if (process.argv[2] === 'install') {
+    (async () => {
+        await init();
+    })();
+} else {
+    // Forward all other CLI commands to the downloaded binary
+    if (!isBinaryInstalled()) {
+        console.error('SimpleLocalize CLI binary is not installed. Please run: npm install');
+        process.exit(1);
+    }
+    // Build the command to forward
+    const args = process.argv.slice(2).map(arg => {
+        // Quote arguments with spaces for safety
+        if (/\s/.test(arg)) return `"${arg}"`;
+        return arg;
+    }).join(' ');
+    try {
+        execSync(`${binaryPath} ${args}`, { stdio: 'inherit' });
+        process.exit(0);
+    } catch (error) {
+        process.exit(error.status || 1);
+    }
+}

package/package.json

@@ -1,20 +1,22 @@
-{
-  "name": "@simplelocalize/cli",
-  "version": "1.0.7",
-  "description": "SimpleLocalize CLI for NPM",
-  "main": "index.cjs",
-  "type": "module",
-  "scripts": {
-    "start": "node index.cjs",
-    "postinstall": "node index.cjs install"
-  },
-  "bin": {
-    "install": "index.cjs",
-    "simplelocalize": "bin/simplelocalize"
-  },
-  "dependencies": {
-    "axios": "^1.8.3"
-  },
-  "author": "Jakub Pomykała",
-  "license": "MIT"
-}
+{
+  "name": "@simplelocalize/cli",
+  "version": "2.9.0-r1",
+  "description": "SimpleLocalize CLI for NPM",
+  "main": "index.cjs",
+  "type": "module",
+  "scripts": {
+    "postinstall": "node index.cjs install"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/simplelocalize/simplelicalize-cli-npm.git"
+  },
+  "bin": {
+    "simplelocalize": "index.cjs"
+  },
+  "dependencies": {
+    "axios": "^1.8.3"
+  },
+  "author": "Jakub Pomykała",
+  "license": "MIT"
+}