@uniformdev/cli 19.40.1-alpha.16 → 19.42.0

package/dist/index.mjs

@@ -1,10 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { cosmiconfigSync } from "cosmiconfig";
-import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
 import * as dotenv from "dotenv";
-import fs5 from "fs";
 import yargs22 from "yargs";
 import { hideBin } from "yargs/helpers";
 
@@ -78,6 +75,9 @@ import { readdir, unlink } from "fs/promises";
 import { extname as extname2, join } from "path";
 
 // src/util.ts
+import { cosmiconfigSync } from "cosmiconfig";
+import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
+import fs from "fs";
 var omit = (object, keys) => {
   const result = keys.reduce((current, key) => {
     const { [key]: _, ...rest } = current;
@@ -88,6 +88,30 @@ var omit = (object, keys) => {
 var cleanFileName = (proposedFileName) => {
   return proposedFileName.replace(/[/<>$+%>!`&*'|{}?"=:\\@]/g, "-");
 };
+var loadConfig = (configPath) => {
+  const moduleName = "uniform";
+  const syncCosmicExplorer = cosmiconfigSync("uniform", {
+    searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.json`],
+    loaders: {
+      ".ts": TypeScriptLoader()
+    }
+  });
+  if (configPath) {
+    if (!fs.existsSync(configPath)) {
+      throw new Error(`Invalid configuration file path: ${configPath}. File does not exist.`);
+    }
+    const configFile = syncCosmicExplorer.load(configPath);
+    if (!(configFile == null ? void 0 : configFile.config.serialization)) {
+      throw new Error(
+        `Invalid configuration file: ${configPath}. Missing config.serialization configuration.`
+      );
+    }
+    return applyDefaultSyncConfiguration((configFile == null ? void 0 : configFile.config) ?? {});
+  } else {
+    const searchedForm = syncCosmicExplorer.search();
+    return applyDefaultSyncConfiguration((searchedForm == null ? void 0 : searchedForm.config) ?? {});
+  }
+};
 
 // src/sync/util.ts
 import { readFileSync, writeFileSync } from "fs";
@@ -354,9 +378,9 @@ ${e == null ? void 0 : e.message}`));
 }
 
 // src/sync/package.ts
-import fs from "fs";
+import fs2 from "fs";
 function readUniformPackage(filename, assertExists) {
-  if (!assertExists && !fs.existsSync(filename)) {
+  if (!assertExists && !fs2.existsSync(filename)) {
     return {};
   }
   const packageContents = readFileToObject(filename);
@@ -3751,7 +3775,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.40.0",
+  version: "19.42.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -4125,7 +4149,7 @@ ${err.message}`);
 
 // src/projects/cloneStarter.ts
 import crypto2 from "crypto";
-import fs2 from "fs";
+import fs3 from "fs";
 import fsj from "fs-jetpack";
 import * as git from "isomorphic-git";
 import * as http from "isomorphic-git/http/node/index.js";
@@ -4142,7 +4166,7 @@ async function cloneStarter({
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
     await git.clone({
-      fs: fs2,
+      fs: fs3,
       http,
       url: `https://github.com/${user}/${repo}`,
       dir: cloneDir,
@@ -4153,13 +4177,13 @@ async function cloneStarter({
     throw new Error(`Failed to fetch starter code: ${err.message}`);
   }
   await done();
-  if (fs2.existsSync(targetDir) && fs2.readdirSync(targetDir).length > 0) {
+  if (fs3.existsSync(targetDir) && fs3.readdirSync(targetDir).length > 0) {
     throw new Error(`"${targetDir}" is not empty`);
   }
   const starterDir = path.join(cloneDir, ...pathSegments);
   fsj.copy(starterDir, targetDir, { overwrite: true });
   if (dotEnvFile) {
-    fs2.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+    fs3.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
   console.log(`
 Your project now lives in ${targetDir} \u2728`);
@@ -4175,7 +4199,7 @@ Installing project dependencies...
 }
 
 // src/projects/getOrCreateProject.ts
-import fs3, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
+import fs4, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import inquirer2 from "inquirer";
 import path2 from "path";
 import slugify from "slugify";
@@ -4302,9 +4326,9 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
     if (!existsSync2(targetDir)) {
       mkdirSync2(targetDir, { recursive: true });
     }
-    if (fs3.readdirSync(targetDir).length > 0) {
+    if (fs4.readdirSync(targetDir).length > 0) {
       targetDir = path2.resolve(targetDir, projectNameSlug);
-      if (fs3.existsSync(targetDir)) {
+      if (fs4.existsSync(targetDir)) {
         throw new Error(`${targetDir} already exists, choose a different name.`);
       }
     }
@@ -6064,14 +6088,14 @@ import { magenta, red as red6 } from "colorette";
 import { join as join2 } from "path";
 
 // src/fs.ts
-import { promises as fs4 } from "fs";
+import { promises as fs5 } from "fs";
 async function readJSON(path4) {
-  const fileContents = await fs4.readFile(path4, "utf-8");
+  const fileContents = await fs5.readFile(path4, "utf-8");
   return JSON.parse(fileContents);
 }
 async function tryReadJSON(path4, missingValue = null) {
   try {
-    const stat = await fs4.stat(path4);
+    const stat = await fs5.stat(path4);
     return stat.isFile() ? await readJSON(path4) : missingValue;
   } catch (e) {
     return missingValue;
@@ -6134,29 +6158,12 @@ First found was: v${firstVersion}`;
 // src/index.ts
 dotenv.config();
 var yarggery = yargs22(hideBin(process.argv));
-var moduleName = "uniform";
-var syncCosmicExplorer = cosmiconfigSync("uniform", {
-  searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.json`],
-  loaders: {
-    ".ts": TypeScriptLoader()
-  }
-});
-var searchedForm = syncCosmicExplorer.search();
-var cosmicConfig = applyDefaultSyncConfiguration((searchedForm == null ? void 0 : searchedForm.config) ?? {});
+var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
+var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {
   describe: "Include verbose logging",
   default: false,
   type: "boolean"
-}).scriptName("uniform").config(cosmicConfig).config("config", function(configPath) {
-  if (!fs5.existsSync(configPath)) {
-    throw new Error(`Invalid configuration file path: ${configPath}. File does not exist.`);
-  }
-  const config2 = syncCosmicExplorer.load(configPath);
-  if (!(config2 == null ? void 0 : config2.config.serialization)) {
-    throw new Error(
-      `Invalid configuration file: ${configPath}. Missing config.serialization configuration.`
-    );
-  }
-  const configuration = applyDefaultSyncConfiguration((config2 == null ? void 0 : config2.config) ?? {});
-  return { serialization: configuration.serialization };
+}).scriptName("uniform").config(configuration).config("config", function() {
+  return {};
 }).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(RedirectCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(OptimizeCommand).demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).argv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.40.1-alpha.16+810fa24de",
+  "version": "19.42.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,10 +16,10 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.40.1-alpha.16+810fa24de",
-    "@uniformdev/context": "19.40.1-alpha.16+810fa24de",
-    "@uniformdev/project-map": "19.40.1-alpha.16+810fa24de",
-    "@uniformdev/redirect": "19.40.1-alpha.16+810fa24de",
+    "@uniformdev/canvas": "19.42.0",
+    "@uniformdev/context": "19.42.0",
+    "@uniformdev/project-map": "19.42.0",
+    "@uniformdev/redirect": "19.42.0",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "810fa24de01ecdc5411e39456f2b5341db908cb0"
+  "gitHead": "33ed87d09bfb50c8557c6bcf4eb232c76f7c99d8"
 }