lecodes-cli 2.2.8 → 2.2.9

package/dist/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lecodes-cli",
-    version: "2.2.8",
+    version: "2.2.9",
     dependencies: {
       "@letary/chisel": "^0.14.0",
       jimp: "^1.6.1",
@@ -76,7 +76,7 @@ var init_package = __esm(() => {
     },
     peerDependencies: {
       "lecodes-design": "^0.11.0",
-      "lecodes-headless": "^2.2.8",
+      "lecodes-headless": "^2.2.9",
       "lecodes-3d-editor": "^0.9.0",
       "lecodes-assets": "^0.2.1",
       "heic-decode": "^2.1.0",
@@ -146,7 +146,7 @@ var init_package = __esm(() => {
 });
 
 // ../../sdk/src/version.ts
-var SDK_VERSION = "2.2.8", sdkMajor = (version) => {
+var SDK_VERSION = "2.2.9", sdkMajor = (version) => {
   const m = version?.match(/^(\d+)\.\d+\.\d+/);
   return m ? Number(m[1]) : null;
 }, bundleSdkVersion = (head) => head.slice(0, 2000).match(/^\/\/ sdk: (\d+\.\d+\.\d+\S*)/m)?.[1] ?? null, bundleRunsOn = (bundleVersion, hostVersion) => sdkMajor(bundleVersion) !== null && sdkMajor(bundleVersion) === sdkMajor(hostVersion);
@@ -217959,6 +217959,82 @@ var readManifest2 = (dir, id) => {
 };
 var readManifestIfAny = (dir, id) => existsSync14(join17(dir, MANIFEST_FILE)) ? readManifest2(dir, id) : null;
 
+// src/plugin/emitPackage.ts
+class PackageError extends Error {
+}
+var swiftPackageName = (url) => (url.replace(/\/+$/, "").split("/").pop() ?? url).replace(/\.git$/, "");
+var iosModule = (id, manifest) => manifest.ios?.module ?? `LeCodes${pascal(id)}`;
+var PACKAGE_FILE = "Package.swift";
+var DEFAULT_SDK_PATH = "../lecodes";
+var emitPackageSwift = (plugins, sdkPath = DEFAULT_SDK_PATH) => {
+  const ios = plugins.filter((p) => p.manifest.ios !== null);
+  const packages = new Map;
+  for (const p of ios) {
+    for (const pkg of p.manifest.ios.packages ?? []) {
+      const prior = packages.get(pkg.url);
+      if (prior && (prior.exact !== pkg.exact || prior.from !== pkg.from)) {
+        throw new PackageError(`"${p.id}" pins ${pkg.url} at ${pkg.exact ?? `from ${pkg.from}`} but "${prior.by}" pins ${prior.exact ?? `from ${prior.from}`} — one package resolves once`);
+      }
+      if (!prior)
+        packages.set(pkg.url, { ...pkg, by: p.id });
+    }
+  }
+  const moduleOf = (p) => iosModule(p.id, p.manifest);
+  const products = ios.map((p) => `        .library(name: "${moduleOf(p)}", targets: ["${moduleOf(p)}"]),`);
+  const dependencies = [
+    `        .package(name: "lecodes", path: sdk),`,
+    ...[...packages.values()].map((pkg) => `        .package(url: "${pkg.url}", ${pkg.exact ? `exact: "${pkg.exact}"` : `from: "${pkg.from}"`}),`)
+  ];
+  const targets = ios.map((p) => {
+    const deps = [
+      `.product(name: "LeCodes", package: "lecodes")`,
+      ...(p.manifest.ios.packages ?? []).flatMap((pkg) => pkg.products.map((name) => `.product(name: "${name}", package: "${swiftPackageName(pkg.url)}")`))
+    ];
+    return [
+      `        // ${p.id}`,
+      `        .target(`,
+      `            name: "${moduleOf(p)}",`,
+      `            dependencies: [${deps.join(", ")}],`,
+      `            path: "plugins/${p.id}/ios"`,
+      `        ),`
+    ].join(`
+`);
+  });
+  return `// swift-tools-version:5.9
+// GENERATED by \`lecodes plugin gen\` from the plugins' manifests (lecodes-plugin.json) — do not edit.
+//
+// The plugins with an iOS half as ONE SwiftPM package: a target per plugin (its sources in
+// plugins/<id>/ios, the packages its manifest names) and a product per plugin. Each plugin is its
+// own module: an Xcode project links a plugin as a product instead of compiling its folder, and two
+// plugins may name a type alike.
+//
+// The SDK is the LeCodes package on disk: LECODES_IOS_SDK_PATH, else the path below (the repo's
+// package.json \`lecodes.iosSdkPath\`, or the sibling ../lecodes). A shell made by \`lecodes app sync\`
+// does not use this package: it vendors the sources into targets of its own, pinned by
+// plugins.lock.json.
+import PackageDescription
+
+let sdk = Context.environment["LECODES_IOS_SDK_PATH"] ?? ${JSON.stringify(sdkPath)}
+
+let package = Package(
+    name: "lecodes-plugins",
+    platforms: [.iOS(.v15)],
+    products: [
+${products.join(`
+`)}
+    ],
+    dependencies: [
+${dependencies.join(`
+`)}
+    ],
+    targets: [
+${targets.join(`
+`)}
+    ]
+)
+`;
+};
+
 // src/commands/app/shared.ts
 var FIRST_PARTY_PLUGINS = {
   camera: "letary/lecodes-plugins",
@@ -218006,7 +218082,6 @@ var desktopDefaultViewport = (root) => {
     height: cfg.desktop.window?.height ?? DESKTOP_DEFAULT_WINDOW.height
   };
 };
-var swiftPackageName = (url) => (url.replace(/\/+$/, "").split("/").pop() ?? url).replace(/\.git$/, "");
 var isLocalPluginSpec = (spec) => spec.startsWith("./") || spec.startsWith("../") || spec.startsWith("/") || spec.startsWith("file:");
 var resolveUpdateUrl = (update, root, sdkVersion) => {
   if (update === false)
@@ -231179,7 +231254,7 @@ var loadTypescript = (dir) => {
 var generatePlugin = (ts, plugin2) => {
   const file = join46(plugin2.dir, CONTRACT_FILE);
   const contract = readContract(ts, file, readFileSync33(file, "utf8"));
-  readManifestIfAny(plugin2.dir, plugin2.id);
+  const manifest = readManifestIfAny(plugin2.dir, plugin2.id);
   const handWritten = existsSync41(join46(plugin2.dir, "sdk", `${plugin2.id}.ts`));
   const single = contract.channels.length === 1;
   const files = contract.channels.map((channel) => ({
@@ -231203,7 +231278,7 @@ var generatePlugin = (ts, plugin2) => {
 ${foreign.map((f5) => `  ${f5}`).join(`
 `)}`);
   }
-  return { contract, files };
+  return { contract, manifest, files };
 };
 var hostImports = (web) => {
   const found = [];
@@ -231243,32 +231318,53 @@ var kotlinPackage = (android) => {
   }
   return { dir, name: relative8(root, dir).split(/[\\/]/).join(".") };
 };
+var repoSdkPath = (root) => {
+  const file = join46(root, "package.json");
+  if (!existsSync41(file))
+    return DEFAULT_SDK_PATH;
+  try {
+    const pkg = JSON.parse(readFileSync33(file, "utf8"));
+    const path2 = pkg.lecodes?.iosSdkPath;
+    if (path2 !== undefined && typeof path2 !== "string")
+      throw new PackageError(`package.json lecodes.iosSdkPath: a path, as a string`);
+    return path2 ?? DEFAULT_SDK_PATH;
+  } catch (e2) {
+    if (e2 instanceof PackageError)
+      throw e2;
+    throw new PackageError(`package.json does not parse: ${e2 instanceof Error ? e2.message : String(e2)}`);
+  }
+};
 var generate = (path2, opts = {}) => {
   const plugins = findPlugins(path2);
   if (plugins.length === 0)
     throw new CliError(`No plugin under ${resolve23(path2)}: a plugin is a directory with a ${CONTRACT_FILE} (one, or plugins/<id>/ of a repo).`);
   const ts = loadTypescript(plugins[0].dir);
   const root = resolve23(path2);
-  const report = { plugins: [], failures: [] };
+  const report = { plugins: [], repo: { written: [], stale: [], fresh: [] }, failures: [] };
+  const place = (f5, entry) => {
+    const name = shown(root, f5.file) || basename23(f5.file);
+    const current = existsSync41(f5.file) ? readFileSync33(f5.file, "utf8") : null;
+    if (current === f5.text) {
+      entry.fresh.push(name);
+      return;
+    }
+    if (opts.check) {
+      entry.stale.push(name);
+      return;
+    }
+    mkdirSync26(join46(f5.file, ".."), { recursive: true });
+    writeFileSync28(f5.file, f5.text);
+    entry.written.push(name);
+  };
+  const manifests = [];
   for (const plugin2 of plugins) {
     try {
-      const { contract, files } = generatePlugin(ts, plugin2);
+      const { contract, manifest, files } = generatePlugin(ts, plugin2);
+      if (manifest)
+        manifests.push({ id: plugin2.id, manifest });
       const entry = { id: plugin2.id, contract, written: [], stale: [], fresh: [] };
-      for (const f5 of files) {
-        const name = shown(root, f5.file) || basename23(f5.file);
-        const current = existsSync41(f5.file) ? readFileSync33(f5.file, "utf8") : null;
-        if (current === f5.text) {
-          entry.fresh.push(name);
-          continue;
-        }
-        if (opts.check) {
-          entry.stale.push(name);
-          continue;
-        }
-        mkdirSync26(join46(f5.file, ".."), { recursive: true });
-        writeFileSync28(f5.file, f5.text);
-        entry.written.push(name);
-      }
+      for (const f5 of files)
+        place(f5, entry);
       report.plugins.push(entry);
     } catch (e2) {
       if (e2 instanceof ContractError)
@@ -231284,6 +231380,17 @@ ${e2.problems.map((p2) => `  ${p2}`).join(`
         throw e2;
     }
   }
+  const isRepo = !existsSync41(join46(root, CONTRACT_FILE));
+  if (isRepo && report.failures.length === 0 && manifests.some((m) => m.manifest.ios)) {
+    try {
+      place({ file: join46(root, PACKAGE_FILE), text: emitPackageSwift(manifests, repoSdkPath(root)) }, report.repo);
+    } catch (e2) {
+      if (e2 instanceof PackageError)
+        report.failures.push(`${PACKAGE_FILE}: ${e2.message}`);
+      else
+        throw e2;
+    }
+  }
   return report;
 };
 
@@ -231294,7 +231401,7 @@ var gen = defineCommand({
   usage: "[path]",
   description: `The path is one plugin (a directory with a contract.d.ts) or a repo that keeps its plugins in plugins/<id>/; the current directory when omitted.
 
-Writes sdk/<id>.gen.ts — the wrapper an app calls: the wire call by call, the class with the wire's methods as its own, and the public export when the plugin has no hand-written sdk/<id>.ts. Where the plugin has an ios/ folder, writes ios/<Name>.gen.swift — the contract's types, the protocol the plugin implements and the glue that reads a call off the wire. Where it has an android/ folder, writes the same as <Name>.gen.kt into the folder of the plugin's Kotlin package (android/ is laid out as a Gradle module: the package is the folder the path under android/src/main/java narrows down to). Where it has a web/ folder, writes web/<id>.gen.ts — the same for the web half, in a file that imports nothing; a web half that imports a LeCodes package is refused, because it would run on that host only. A contract the generator does not understand is an error with its line, and every problem of a file is reported at once.
+Writes sdk/<id>.gen.ts — the wrapper an app calls: the wire call by call, the class with the wire's methods as its own, and the public export when the plugin has no hand-written sdk/<id>.ts. Where the plugin has an ios/ folder, writes ios/<Name>.gen.swift — the contract's types, the protocol the plugin implements and the glue that reads a call off the wire. Where it has an android/ folder, writes the same as <Name>.gen.kt into the folder of the plugin's Kotlin package (android/ is laid out as a Gradle module: the package is the folder the path under android/src/main/java narrows down to). Where it has a web/ folder, writes web/<id>.gen.ts — the same for the web half, in a file that imports nothing; a web half that imports a LeCodes package is refused, because it would run on that host only. A repo of plugins also gets its Package.swift from the manifests: the iOS halves as one SwiftPM package, a target and a product per plugin, the SDK as a package on disk (LECODES_IOS_SDK_PATH, else the repo's package.json lecodes.iosSdkPath, else ../lecodes) — what an Xcode project links the halves as (a shell vendors the sources instead). A contract the generator does not understand is an error with its line, and every problem of a file is reported at once.
 
 Generated files are committed. Reading a contract needs TypeScript in the plugin's repo.`,
   flags: {
@@ -231313,9 +231420,18 @@ Generated files are committed. Reading a contract needs TypeScript in the plugin
       for (const f5 of p2.fresh)
         log(c.dim(`  fresh     ${f5}`));
     }
+    if (report.repo.written.length + report.repo.stale.length + report.repo.fresh.length > 0) {
+      info(`${c.bold("the repo")}  ${c.dim("Package.swift from the manifests")}`);
+      for (const f5 of report.repo.written)
+        log(c.green(`  written   ${f5}`));
+      for (const f5 of report.repo.stale)
+        log(c.red(`  stale     ${f5}`));
+      for (const f5 of report.repo.fresh)
+        log(c.dim(`  fresh     ${f5}`));
+    }
     for (const failure2 of report.failures)
       log(c.red(failure2));
-    const stale = report.plugins.reduce((n2, p2) => n2 + p2.stale.length, 0);
+    const stale = report.plugins.reduce((n2, p2) => n2 + p2.stale.length, 0) + report.repo.stale.length;
     if (report.failures.length)
       throw new CliError(`${report.failures.length} contract${report.failures.length === 1 ? "" : "s"} did not generate.`);
     if (stale)

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "lecodes-cli",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "dependencies": {
     "@letary/chisel": "^0.14.0",
     "jimp": "^1.6.1",
-    "lecodes-sdk": "2.2.8"
+    "lecodes-sdk": "2.2.9"
   },
   "devDependencies": {
     "lecodes-design": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-design/lecodes-design-0.11.0.tgz",
-    "lecodes-headless": "2.2.8",
+    "lecodes-headless": "2.2.9",
     "qrcode-terminal": "^0.12.0",
     "lecodes-3d-editor": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-3d-editor/lecodes-3d-editor-0.9.0.tgz",
     "lecodes-assets": "0.2.1",
     "lecodes-creator-nav": "0.19.0",
-    "lecodes-gl-lite": "2.2.8",
-    "lecodes-web-frame": "2.2.8",
-    "lecodes-web-player": "2.2.8",
-    "lecodes-web-shared": "2.2.8",
+    "lecodes-gl-lite": "2.2.9",
+    "lecodes-web-frame": "2.2.9",
+    "lecodes-web-player": "2.2.9",
+    "lecodes-web-shared": "2.2.9",
     "lecodes-web-lite": "2.0.2",
     "heic-decode": "^2.1.0",
     "marcidb-embedded": "^0.15.0",
@@ -24,7 +24,7 @@
   },
   "peerDependencies": {
     "lecodes-design": "^0.11.0",
-    "lecodes-headless": "^2.2.8",
+    "lecodes-headless": "^2.2.9",
     "lecodes-3d-editor": "^0.9.0",
     "lecodes-assets": "^0.2.1",
     "heic-decode": "^2.1.0",