@tutao/licc 3.98.12 → 3.98.13

package/dist/cli.js

@@ -1,83 +0,0 @@
-#!/usr/bin/env node
-import { generate } from "./index.js";
-import * as fs from "fs";
-import * as path from "path";
-import { globby } from "zx";
-import { Argument, Option, program } from "commander";
-const PLATFORMS = ["ios", "web", "android", "desktop"];
-const USAGE = `licc [options] from_dir to_dir
-
-will recursively take all JSON files from \`from-dir\` and compile them.
-output files are written into \`to-dir\`, without preserving subdirectory structure.`;
-await program
-    .usage(USAGE)
-    .addArgument(new Argument("from_dir").argRequired())
-    .addArgument(new Argument("to_dir").argOptional())
-    .addOption(new Option('-p, --platform <platform>', 'platform to generate code for. if not specified, from_dir must be omitted as well. In this case, licc will read <from_dir>/.liccc as a json map from platform to output dir. if -p is set, from_dir must be set as well.')
-    .makeOptionMandatory(false)
-    .choices(PLATFORMS))
-    .action(async (from_dir, to_dir, { platform }) => {
-    assert(!(platform == null && to_dir != null), "can't omit platform and use an explicit output dir. specify both -p <platform> and to_dir or none of them.");
-    assert(!(platform != null && to_dir == null), "can't use an explicit platform but no output dir. specify both -p <platform> and to_dir or none of them.");
-    let conf = {};
-    if (platform != null) {
-        conf[platform] = path.resolve(process.cwd(), to_dir);
-    }
-    else {
-        // check if there's a .liccc file that states the desired platforms and output dirs
-        const confPath = path.join(from_dir, ".liccc");
-        try {
-            const relConf = JSON.parse(await fs.promises.readFile(confPath, { encoding: "utf-8" }));
-            for (let [relPlatform, relPath] of Object.entries(relConf)) {
-                if (relPlatform === "__comment")
-                    continue;
-                assert(PLATFORMS.includes(relPlatform), `invalid platform in .liccc: ${relPlatform}`);
-                conf[relPlatform] = path.resolve(process.cwd(), from_dir, relPath);
-            }
-        }
-        catch (e) {
-            console.log(`unable to read ${confPath} as JSON: ${e}`);
-            process.exit(1);
-        }
-    }
-    await run(from_dir, conf);
-})
-    .parseAsync(process.argv);
-async function run(from_dir, conf) {
-    const inputFiles = await globby(path.join(process.cwd(), from_dir, "*/**/*.json"));
-    const inputMap = new Map(inputFiles.map((n) => ([path.basename(n, ".json"), fs.readFileSync(n, "utf8")])));
-    // doing it here because some platforms generate into the same dir.
-    for (let outDir of Object.values(conf)) {
-        clearDir(outDir);
-    }
-    for (let [confPlatform, confOutDir] of Object.entries(conf)) {
-        console.log("generating for", confPlatform, "into", confOutDir);
-        try {
-            await generate(confPlatform, inputMap, confOutDir);
-        }
-        catch (e) {
-            assert(false, `compilation failed with ${e}`);
-        }
-        console.log("done; no errors\n");
-    }
-}
-function assert(proposition, text) {
-    if (proposition)
-        return;
-    console.log("\nFatal Error:\n", text);
-    console.log("");
-    console.log(program.helpInformation());
-    process.exit(1);
-}
-function clearDir(dir) {
-    console.log("clearing dir:", dir);
-    try {
-        const files = fs.readdirSync(dir);
-        for (const file of files) {
-            fs.unlinkSync(path.join(dir, file));
-        }
-    }
-    catch (e) {
-        console.log("could not clear dir:", e);
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tutao/licc",
-	"version": "3.98.12",
+	"version": "3.98.13",
 	"bin": {
 		"licc": "dist/cli.js"
 	},
@@ -10,7 +10,7 @@
 	"scripts": {
 		"build": "tsc -b",
 		"test": "rm -rf ./test/build && tsc -b test && cd test/build && node test/Suite.js",
-		"preinstall": "mkdir -p dist && touch dist/cli.js"
+		"preinstall": "node preinstall.js"
 	},
 	"author": "",
 	"license": "GPL-3.0",
@@ -19,7 +19,7 @@
 		"commander": "9.3.0"
 	},
 	"devDependencies": {
-		"@tutao/tutanota-test-utils": "3.98.12",
+		"@tutao/tutanota-test-utils": "3.98.13",
 		"ospec": "https://github.com/tutao/ospec.git#0472107629ede33be4c4d19e89f237a6d7b0cb11"
 	}
 }

package/preinstall.js

@@ -0,0 +1,9 @@
+/** @file little script to prepare licc install. Implemented as a node script to please Windows. */
+import * as fs from "fs"
+
+// mkdir -p dist
+fs.mkdirSync("dist", {recursive: true})
+// touch dist/cli.js
+fs.closeSync(fs.openSync("dist/cli.js", 'w'))
+
+