@storm-software/workspace-tools 1.43.6 → 1.43.8

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.43.7](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.6...workspace-tools-v1.43.7) (2024-01-17)
+
+
+### Bug Fixes
+
+* **config-tools:** Resolved issue with bad config file lookup logic ([9967de4](https://github.com/storm-software/storm-ops/commit/9967de48b063a83f42c74c3f6dd667d31123dc6f))
+* **workspace-tools:** Resolved issue with config file names changing ([f18c40c](https://github.com/storm-software/storm-ops/commit/f18c40c1be8c154aff163692e79351b34accb991))
+
+## [1.43.6](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.5...workspace-tools-v1.43.6) (2024-01-17)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Added code to properly parse out the config file ([c345fef](https://github.com/storm-software/storm-ops/commit/c345fefc6389a9a10b3f5b8446eb76982f45e6f7))
+
 ## [1.43.5](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.4...workspace-tools-v1.43.5) (2024-01-17)
 
 

package/index.js

@@ -34308,7 +34308,7 @@ var require_jsonfile = __commonJS({
       return obj;
     }
     var readFile = universalify.fromPromise(_readFile);
-    function readFileSync4(file, options = {}) {
+    function readFileSync3(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
       }
@@ -34340,7 +34340,7 @@ var require_jsonfile = __commonJS({
     }
     var jsonfile = {
       readFile,
-      readFileSync: readFileSync4,
+      readFileSync: readFileSync3,
       writeFile: writeFile2,
       writeFileSync: writeFileSync3
     };
@@ -46989,7 +46989,7 @@ var require_lib6 = __commonJS({
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
-    var readFileSync4 = (fp) => {
+    var readFileSync3 = (fp) => {
       return _fs.default.readFileSync(fp, "utf8");
     };
     var pathExists = (fp) => new Promise((resolve) => {
@@ -47113,7 +47113,7 @@ var require_lib6 = __commonJS({
               if (this.packageJsonCache.has(filepath2)) {
                 return this.packageJsonCache.get(filepath2)[options.packageKey];
               }
-              const data2 = this.options.parseJSON(readFileSync4(filepath2));
+              const data2 = this.options.parseJSON(readFileSync3(filepath2));
               return data2;
             }
           };
@@ -47147,7 +47147,7 @@ var require_lib6 = __commonJS({
               if (this.packageJsonCache.has(filepath2)) {
                 return this.packageJsonCache.get(filepath2)[options.packageKey];
               }
-              const data2 = this.options.parseJSON(readFileSync4(filepath2));
+              const data2 = this.options.parseJSON(readFileSync3(filepath2));
               return data2;
             }
           };
@@ -73213,7 +73213,7 @@ var require_util5 = __commonJS({
     var normalize2 = createSafeHandler((url) => {
     });
     exports.normalize = normalize2;
-    function join8(aRoot, aPath) {
+    function join7(aRoot, aPath) {
       const pathType = getURLType(aPath);
       const rootType = getURLType(aRoot);
       aRoot = ensureDirectory(aRoot);
@@ -73239,7 +73239,7 @@ var require_util5 = __commonJS({
       const newPath = withBase(aPath, withBase(aRoot, base));
       return computeRelativeURL(base, newPath);
     }
-    exports.join = join8;
+    exports.join = join7;
     function relative(rootURL, targetURL) {
       const result = relativeIfPossible(rootURL, targetURL);
       return typeof result === "string" ? result : normalize2(targetURL);
@@ -73269,9 +73269,9 @@ var require_util5 = __commonJS({
       }
       let url = normalize2(sourceURL || "");
       if (sourceRoot)
-        url = join8(sourceRoot, url);
+        url = join7(sourceRoot, url);
       if (sourceMapURL)
-        url = join8(trimFilename(sourceMapURL), url);
+        url = join7(trimFilename(sourceMapURL), url);
       return url;
     }
     exports.computeSourceURL = computeSourceURL;
@@ -75036,8 +75036,8 @@ var require_source_map = __commonJS({
 // node_modules/.pnpm/rollup@4.5.0/node_modules/rollup/dist/native.js
 var require_native = __commonJS({
   "node_modules/.pnpm/rollup@4.5.0/node_modules/rollup/dist/native.js"(exports, module2) {
-    var { existsSync: existsSync6 } = require("node:fs");
-    var { join: join8 } = require("node:path");
+    var { existsSync: existsSync5 } = require("node:fs");
+    var { join: join7 } = require("node:path");
     var { platform, arch, report } = require("node:process");
     var isMusl = () => !report.getReport().header.glibcVersionRuntime;
     var bindingsByPlatformAndArch = {
@@ -75087,7 +75087,7 @@ If this is important to you, please consider supporting Rollup to make a native
       return imported.base;
     }
     var localName = `./rollup.${packageBase}.node`;
-    var { parse, parseAsync, xxhashBase64Url } = existsSync6(join8(__dirname, localName)) ? require(localName) : require(`@rollup/rollup-${packageBase}`);
+    var { parse, parseAsync, xxhashBase64Url } = existsSync5(join7(__dirname, localName)) ? require(localName) : require(`@rollup/rollup-${packageBase}`);
     module2.exports.parse = parse;
     module2.exports.parseAsync = parseAsync;
     module2.exports.xxhashBase64Url = xxhashBase64Url;
@@ -111220,7 +111220,7 @@ var require_TransformerError = __commonJS({
       TransformerError2.from = function(method) {
         return function(errors) {
           var body = errors.map(function(e) {
-            var subject = e.explore.object === null ? "" : join8(e.explore.object)(e.explore.property);
+            var subject = e.explore.object === null ? "" : join7(e.explore.object)(e.explore.property);
             var type = "".concat(subject.length ? "".concat(subject, ": ") : "").concat(e.name);
             return "- ".concat(type, "\n").concat(e.messages.map(function(msg) {
               return "  - ".concat(msg);
@@ -111232,7 +111232,7 @@ var require_TransformerError = __commonJS({
           });
         };
       };
-      var join8 = function(object) {
+      var join7 = function(object) {
         return function(key) {
           if (key === null)
             return object.name;
@@ -117312,13 +117312,13 @@ var require_application_object = __commonJS({
             return __assign2(__assign2({ type: "object", properties, nullable: options.purpose === "swagger" ? nullable : void 0, required: required.length ? required : void 0, description: obj.description }, options.surplus ? { "x-typia-jsDocTags": obj.jsDocTags } : {}), options.purpose === "ajv" ? extraProps : options.surplus ? {
               "x-typia-additionalProperties": extraProps.additionalProperties,
               "x-typia-patternProperties": extraProps.patternProperties,
-              additionalProperties: join8(options)(components)(extraMeta)
+              additionalProperties: join7(options)(components)(extraMeta)
             } : {});
           };
         };
       };
     };
-    var join8 = function(options) {
+    var join7 = function(options) {
       return function(components) {
         return function(extra) {
           var _a;
@@ -126381,7 +126381,7 @@ module.exports = __toCommonJS(workspace_tools_exports);
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -126509,10 +126509,6 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
   return result;
 }
 
-// packages/config-tools/src/utilities/get-default-config.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -130173,51 +130169,6 @@ var DefaultStormConfig = {
   colors: { ...DefaultColorConfig },
   extensions: {}
 };
-var getDefaultConfig = (config = {}, root) => {
-  let name = "storm-workspace";
-  let namespace = "storm-software";
-  let repository = "https://github.com/storm-software/storm-ops";
-  let license = DefaultStormConfig.license;
-  let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
-      encoding: "utf-8"
-    });
-    if (file) {
-      const packageJson = JSON.parse(file);
-      if (packageJson.name) {
-        name = packageJson.name;
-      }
-      if (packageJson.namespace) {
-        namespace = packageJson.namespace;
-      }
-      if (packageJson.repository?.url) {
-        repository = packageJson.repository?.url;
-      }
-      if (packageJson.license) {
-        license = packageJson.license;
-      }
-      if (packageJson.homepage) {
-        homepage = packageJson.homepage;
-      }
-    }
-  }
-  return StormConfigSchema.parse({
-    ...config,
-    ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
-    workspaceRoot,
-    name,
-    namespace,
-    repository,
-    license: license ?? DefaultStormConfig.license,
-    homepage: homepage ?? DefaultStormConfig.homepage,
-    extensions: {
-      ...config.extensions
-    }
-  });
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -130619,26 +130570,15 @@ var getConfigEnv = () => {
 
 // packages/config-tools/src/create-storm-config.ts
 var loadStormConfig = async (workspaceRoot) => {
-  let config = {};
   let _workspaceRoot = workspaceRoot;
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = await getDefaultConfig(
-    {
-      ...await getConfigFile(_workspaceRoot),
-      ...getConfigEnv()
-    },
-    _workspaceRoot
-  );
-  if (configFile) {
-    config = StormConfigSchema.parse(configFile);
-  } else {
-    writeWarning(
-      config,
-      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
-    );
-  }
+  const configFile = {
+    ...await getConfigFile(_workspaceRoot),
+    ...getConfigEnv()
+  };
+  const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   return config;
 };
@@ -131429,9 +131369,9 @@ ${commentStart} ----------------------------------------------------------------
 };
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-var import_node_fs3 = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_promises2 = require("node:fs/promises");
-var import_node_path4 = require("node:path");
+var import_node_path3 = require("node:path");
 var import_esbuild_decorators = __toESM(require_src2());
 var import_devkit3 = __toESM(require_devkit());
 var import_js2 = __toESM(require_src());
@@ -137663,13 +137603,13 @@ var import_tsup = __toESM(require_dist6());
 var ts = __toESM(require("typescript"));
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
-var import_node_path3 = require("node:path");
+var import_node_path2 = require("node:path");
 var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 function findFileName(filePath) {
   return filePath?.split(
-    filePath?.includes(import_node_path3.sep) ? import_node_path3.sep : filePath?.includes("/") ? "/" : "\\"
+    filePath?.includes(import_node_path2.sep) ? import_node_path2.sep : filePath?.includes("/") ? "/" : "\\"
   )?.pop() ?? "";
 }
 
@@ -137795,9 +137735,9 @@ ${Object.keys(options).map(
   if (!result.success) {
     throw new Error("The Build process failed trying to copy assets");
   }
-  const pathToPackageJson = (0, import_node_path4.join)(context.root, projectRoot, "package.json");
+  const pathToPackageJson = (0, import_node_path3.join)(context.root, projectRoot, "package.json");
   const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit3.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-  const workspacePackageJson = (0, import_devkit3.readJsonFile)((0, import_node_path4.join)(workspaceRoot, "package.json"));
+  const workspacePackageJson = (0, import_devkit3.readJsonFile)((0, import_node_path3.join)(workspaceRoot, "package.json"));
   options.external = options.external || [];
   if (workspacePackageJson?.dependencies) {
     options.external = Object.keys(workspacePackageJson?.dependencies).reduce(
@@ -137835,9 +137775,7 @@ ${Object.keys(options).map(
   }
   if (implicitDependencies && implicitDependencies.length > 0) {
     options.external = implicitDependencies.reduce((ret, key) => {
-      if (getLogLevel(config?.logLevel) >= LogLevel.DEBUG) {
-        writeDebug(config, `\u26A1 Adding implicit dependency: ${key}`);
-      }
+      writeDebug(config, `\u26A1 Adding implicit dependency: ${key}`);
       const projectConfig = projectConfigs[key];
       if (projectConfig?.targets?.build) {
         const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
@@ -137958,11 +137896,11 @@ ${externalDependencies.map((dep) => {
           },
           ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
             [removeExtension(entryPoint).replace(sourceRoot, "")]: {
-              types: (0, import_node_path4.join)(
+              types: (0, import_node_path3.join)(
                 `./${distPaths[0]}`,
                 `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
               ),
-              default: (0, import_node_path4.join)(
+              default: (0, import_node_path3.join)(
                 `./${distPaths[0]}`,
                 `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
               )
@@ -138008,7 +137946,7 @@ ${externalDependencies.map((dep) => {
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
         }
-        packageJson.source ??= `${(0, import_node_path4.join)(distSrc, "index.ts").replaceAll("\\", "/")}`;
+        packageJson.source ??= `${(0, import_node_path3.join)(distSrc, "index.ts").replaceAll("\\", "/")}`;
       }
       packageJson.sideEffects ??= false;
       packageJson.files ??= ["dist/**/*"];
@@ -138026,10 +137964,10 @@ ${externalDependencies.map((dep) => {
     packageJson.license ??= workspacePackageJson.license;
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path4.join)("packages", context.projectName);
-    const packageJsonPath = (0, import_node_path4.join)(context.root, options.outputPath, "package.json");
+    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path3.join)("packages", context.projectName);
+    const packageJsonPath = (0, import_node_path3.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
-    (0, import_node_fs3.writeFileSync)(
+    (0, import_node_fs2.writeFileSync)(
       packageJsonPath,
       await (0, import_prettier.format)(JSON.stringify(packageJson), {
         ...prettierOptions,
@@ -138053,7 +137991,7 @@ ${externalDependencies.map((dep) => {
           await (0, import_prettier.format)(
             `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
 
-${(0, import_node_fs3.readFileSync)(file, "utf-8")}`,
+${(0, import_node_fs2.readFileSync)(file, "utf-8")}`,
             {
               ...prettierOptions,
               parser: "typescript"
@@ -138158,11 +138096,11 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
         emitDeclarationOnly: true,
         declaration: true,
         declarationMap: true,
-        declarationDir: (0, import_node_path4.join)(workspaceRoot, "tmp", ".tsup", "declaration")
+        declarationDir: (0, import_node_path3.join)(workspaceRoot, "tmp", ".tsup", "declaration")
       }
     },
     ts.sys,
-    (0, import_node_path4.dirname)(options.tsConfig)
+    (0, import_node_path3.dirname)(options.tsConfig)
   );
   tsConfig.options.pathsBasePath = workspaceRoot;
   if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
@@ -139840,12 +139778,12 @@ var generator_default3 = withRunGenerator(
 );
 
 // packages/workspace-tools/src/utils/find-cache-dir.ts
-var import_node_fs4 = require("node:fs");
-var import_node_path5 = require("node:path");
+var import_node_fs3 = require("node:fs");
+var import_node_path4 = require("node:path");
 var import_node_process = require("node:process");
 var isWritable2 = (path3) => {
   try {
-    (0, import_node_fs4.accessSync)(path3, import_node_fs4.constants.W_OK);
+    (0, import_node_fs3.accessSync)(path3, import_node_fs3.constants.W_OK);
     return true;
   } catch {
     return false;
@@ -139853,13 +139791,13 @@ var isWritable2 = (path3) => {
 };
 function useDirectory(directory, { create = true }) {
   if (create) {
-    (0, import_node_fs4.mkdirSync)(directory, { recursive: true });
+    (0, import_node_fs3.mkdirSync)(directory, { recursive: true });
   }
   return directory;
 }
 function getNodeModuleDirectory(workspaceRoot) {
-  const nodeModules = (0, import_node_path5.join)(workspaceRoot, "node_modules");
-  if ((0, import_node_fs4.existsSync)(nodeModules) && !isWritable2(nodeModules)) {
+  const nodeModules = (0, import_node_path4.join)(workspaceRoot, "node_modules");
+  if ((0, import_node_fs3.existsSync)(nodeModules) && !isWritable2(nodeModules)) {
     throw new Error("Cannot write to node_modules directory");
   }
   return nodeModules;
@@ -139875,10 +139813,10 @@ function findCacheDirectory({
   create: true
 }) {
   if (import_node_process.env.CACHE_DIR && !["true", "false", "1", "0"].includes(import_node_process.env.CACHE_DIR)) {
-    return useDirectory((0, import_node_path5.join)(import_node_process.env.CACHE_DIR, name, cacheName), { create });
+    return useDirectory((0, import_node_path4.join)(import_node_process.env.CACHE_DIR, name, cacheName), { create });
   }
   if (import_node_process.env.STORM_CACHE_DIR && !["true", "false", "1", "0"].includes(import_node_process.env.STORM_CACHE_DIR)) {
-    return useDirectory((0, import_node_path5.join)(import_node_process.env.STORM_CACHE_DIR, name, cacheName), {
+    return useDirectory((0, import_node_path4.join)(import_node_process.env.STORM_CACHE_DIR, name, cacheName), {
       create
     });
   }
@@ -139887,14 +139825,14 @@ function findCacheDirectory({
     throw new Error("Cannot find node_modules directory");
   }
   return useDirectory(
-    (0, import_node_path5.join)(workspaceRoot, "node_modules", ".cache", name, cacheName),
+    (0, import_node_path4.join)(workspaceRoot, "node_modules", ".cache", name, cacheName),
     { create }
   );
 }
 
 // packages/workspace-tools/src/utils/workspace-storage.ts
-var import_node_fs5 = require("node:fs");
-var import_node_path6 = require("node:path");
+var import_node_fs4 = require("node:fs");
+var import_node_path5 = require("node:path");
 var WorkspaceStorage = class {
   constructor({
     cacheName,
@@ -139914,9 +139852,9 @@ var WorkspaceStorage = class {
    * @returns The value of the key
    */
   getItem(key) {
-    const cacheFile = (0, import_node_path6.join)(this.cacheDir, key);
-    if ((0, import_node_fs5.existsSync)(cacheFile)) {
-      return (0, import_node_fs5.readFileSync)(cacheFile, "utf-8");
+    const cacheFile = (0, import_node_path5.join)(this.cacheDir, key);
+    if ((0, import_node_fs4.existsSync)(cacheFile)) {
+      return (0, import_node_fs4.readFileSync)(cacheFile, "utf-8");
     }
     return void 0;
   }
@@ -139927,7 +139865,7 @@ var WorkspaceStorage = class {
    * @param value - The value to set
    */
   setItem(key, value) {
-    (0, import_node_fs5.writeFileSync)((0, import_node_path6.join)(this.cacheDir, key), value, { encoding: "utf-8" });
+    (0, import_node_fs4.writeFileSync)((0, import_node_path5.join)(this.cacheDir, key), value, { encoding: "utf-8" });
   }
   /**
    * Remove item from cache
@@ -139935,14 +139873,14 @@ var WorkspaceStorage = class {
    * @param key - The key to remove
    */
   removeItem(key) {
-    (0, import_node_fs5.rmSync)((0, import_node_path6.join)(this.cacheDir, key), { force: true, recursive: true });
+    (0, import_node_fs4.rmSync)((0, import_node_path5.join)(this.cacheDir, key), { force: true, recursive: true });
   }
   /**
    * Clear the cache
    */
   clear() {
-    (0, import_node_fs5.readdirSync)(this.cacheDir).forEach((cacheFile) => {
-      (0, import_node_fs5.rmSync)(cacheFile, { force: true, recursive: true });
+    (0, import_node_fs4.readdirSync)(this.cacheDir).forEach((cacheFile) => {
+      (0, import_node_fs4.rmSync)(cacheFile, { force: true, recursive: true });
     });
   }
   /**
@@ -139952,7 +139890,7 @@ var WorkspaceStorage = class {
    * @returns The key at the index
    */
   key(index) {
-    const files = (0, import_node_fs5.readdirSync)(this.cacheDir);
+    const files = (0, import_node_fs4.readdirSync)(this.cacheDir);
     if (index < files.length && index >= 0) {
       return files[index];
     }