@simplelocalize/cli 1.0.8 → 2.9.0-r2

package/README.md

@@ -1,4 +1,4 @@
-# SimpleLocalize CLI via npm (work in progress)
+# 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)
@@ -7,15 +7,13 @@ in their workflows.
 ## Installation
 
 ```
-npm install @simplelocalize/cli@1.0.8
+npm install @simplelocalize/cli@2.9.0-r1
 ```
 
 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`.
 
-> The work on this package is in progress, and at time of writing this documentation, the plugin installs the newest version of the CLI, which is 2.8.0
-
 ## Usage
 
 Package SimpleLocalize CLI in your project and makes it available in `package.json` scripts.
@@ -27,15 +25,28 @@ Package SimpleLocalize CLI in your project and makes it available in `package.js
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "@simplelocalize/cli": "^1.0.8",
+    "@simplelocalize/cli": "^2.9.0-r1",
   },
   "scripts": {
     "start": "react-scripts start",
-    "sl:download": "simplelocalize downlaod",
+    "sl:download": "simplelocalize download",
     "sl:upload": "simplelocalize upload",
-    "sl:autotranslate": "simplelocalize autotranslate"
+    "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-r1` will install SimpleLocalize CLI 2.9.0 and this npm package version is 1.
+`@simplelocalize/cli@2.9.0-r2` 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

@@ -10,10 +10,16 @@ if (os.platform() === 'win32') {
     binaryPath += '.exe';
 }
 
+const getExpectedCliVersion = () => {
+    const packageVersion = require('./package.json').version;
+    return packageVersion.split('-')[0];
+};
+
 const isBinaryInstalled = () => {
     try {
-        execSync(binaryPath + ' --version', { stdio: 'ignore' });
-        return true;
+        const output = execSync(binaryPath + ' --version').toString().trim();
+        const expectedVersion = getExpectedCliVersion();
+        return output.includes(expectedVersion);
     }
     catch (error) {
         return false;
@@ -49,11 +55,12 @@ const buildDownloadBinaryUrl = (version) => {
         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}`
+    return `https://get.simplelocalize.io/binaries/${version}/simplelocalize-cli-${platform}${arch}`
 }
 
 async function installBinary() {
-    const cliVersion = "2.8.0";
+    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'));
@@ -77,6 +84,11 @@ async function installBinary() {
         console.log('Making binary executable...');
         fs.chmodSync(binaryPath, 0o755);
     }
+
+    // Ensure binary exists and is executable before continuing
+    if (!fs.existsSync(binaryPath)) {
+        throw new Error('Binary file was not created!');
+    }
 }
 
 const linkToNodeModulesBin = () => {
@@ -86,6 +98,12 @@ const linkToNodeModulesBin = () => {
         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);
     }
@@ -111,4 +129,27 @@ const init = async () => {
     process.exit(0);
 }
 
-init();
+// 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,11 +1,10 @@
 {
   "name": "@simplelocalize/cli",
-  "version": "1.0.8",
+  "version": "2.9.0-r2",
   "description": "SimpleLocalize CLI for NPM",
   "main": "index.cjs",
   "type": "module",
   "scripts": {
-    "start": "node index.cjs",
     "postinstall": "node index.cjs install"
   },
   "repository": {
@@ -13,8 +12,7 @@
     "url": "https://github.com/simplelocalize/simplelicalize-cli-npm.git"
   },
   "bin": {
-    "install": "index.cjs",
-    "simplelocalize": "bin/simplelocalize"
+    "simplelocalize": "index.cjs"
   },
   "dependencies": {
     "axios": "^1.8.3"