@ms-cloudpack/config 0.35.1 → 0.35.3

package/lib/writeConfig/writeGeneratedConfig.d.ts

@@ -17,7 +17,7 @@ export declare const fileHeaderComment = "/**\n * THIS FILE IS AUTO-GENERATED.\n
  */
 export declare function writeGeneratedConfig(config: GeneratedConfig, appPath: string): Promise<'written' | 'deleted' | 'no-op'>;
 /**
- * Due to optimization, some package settings may end up with a "match" key but nothing else.
+ * Due to optimization, some package settings may end up with empty settings.
  * These would add useless bloat, so filter them out before writing the generated config.
  * This function removes those settings by mutating the input generated config.
  */

package/lib/writeConfig/writeGeneratedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeGeneratedConfig.d.ts","sourceRoot":"","sources":["../../src/writeConfig/writeGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAOlE;;;GAGG;AACH,eAAO,MAAM,iBAAiB,oFAAoF,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,CAwB1C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAElE"}
+{"version":3,"file":"writeGeneratedConfig.d.ts","sourceRoot":"","sources":["../../src/writeConfig/writeGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAOlE;;;GAGG;AACH,eAAO,MAAM,iBAAiB,oFAAoF,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,CAwB1C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAsBlE"}

package/lib/writeConfig/writeGeneratedConfig.js

@@ -37,11 +37,29 @@ export async function writeGeneratedConfig(config, appPath) {
     return 'written';
 }
 /**
- * Due to optimization, some package settings may end up with a "match" key but nothing else.
+ * Due to optimization, some package settings may end up with empty settings.
  * These would add useless bloat, so filter them out before writing the generated config.
  * This function removes those settings by mutating the input generated config.
  */
 export function cleanGeneratedConfig(config) {
-    config.packageSettings = config.packageSettings?.filter((s) => Object.keys(s).length > 1);
+    if (!config.packageSettings) {
+        return;
+    }
+    // Remove empty settings
+    config.packageSettings.forEach((s) => {
+        if (s.exports && Object.keys(s.exports).length === 0) {
+            delete s.exports;
+        }
+        if (s.dynamicImports?.length === 0) {
+            delete s.dynamicImports;
+        }
+        if (s.excludedDependencies?.length === 0) {
+            delete s.excludedDependencies;
+        }
+        if (s.includedDependencies?.length === 0) {
+            delete s.includedDependencies;
+        }
+    });
+    config.packageSettings = config.packageSettings.filter((s) => Object.keys(s).length > 1);
 }
 //# sourceMappingURL=writeGeneratedConfig.js.map

package/lib/writeConfig/writeGeneratedConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeGeneratedConfig.js","sourceRoot":"","sources":["../../src/writeConfig/writeGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,iFAAiF,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAuB,EACvB,OAAe;IAEf,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;QACpC,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACvC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACnC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,SAAS,CACb,mBAAmB,EACnB;QACE,OAAO,EAAE,2BAA2B;QACpC,GAAG,MAAM;KACV,EACD,EAAE,iBAAiB,EAAE,CACtB,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAuB;IAC1D,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC5F,CAAC","sourcesContent":["import type { GeneratedConfig } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport fs from 'fs';\nimport { getConfigPath } from '../getConfigPath.js';\nimport { generatedAppConfigSchemaUrl } from '../constants.js';\nimport { sortGeneratedConfig } from './sortGeneratedConfig.js';\n\n/**\n * Comment added to the top of the generated file (exported for testing only).\n * @internal\n */\nexport const fileHeaderComment = `/**\\n * THIS FILE IS AUTO-GENERATED.\\n * DO NOT MANUALLY EDIT THIS FILE.\\n */\\n`;\n\n/**\n * Clean up the generated config (sort it and remove empty settings) and write it to\n * cloudpack.generated.json. This is used at the end of `init`.\n *\n * If the config file exists but is no longer needed, it will be deleted.\n *\n * @returns\n * - `'written'` if the config was written\n * - `'deleted'` if the config previously existed but is now empty and was deleted\n * - `'no-op'` if the config didn't previously exist and is still empty\n */\nexport async function writeGeneratedConfig(\n  config: GeneratedConfig,\n  appPath: string,\n): Promise<'written' | 'deleted' | 'no-op'> {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  sortGeneratedConfig(config);\n\n  cleanGeneratedConfig(config);\n\n  if (!config.packageSettings?.length) {\n    if (fs.existsSync(generatedConfigPath)) {\n      fs.unlinkSync(generatedConfigPath);\n      return 'deleted';\n    }\n    return 'no-op';\n  }\n\n  await writeJson(\n    generatedConfigPath,\n    {\n      $schema: generatedAppConfigSchemaUrl,\n      ...config,\n    },\n    { fileHeaderComment },\n  );\n  return 'written';\n}\n\n/**\n * Due to optimization, some package settings may end up with a \"match\" key but nothing else.\n * These would add useless bloat, so filter them out before writing the generated config.\n * This function removes those settings by mutating the input generated config.\n */\nexport function cleanGeneratedConfig(config: GeneratedConfig): void {\n  config.packageSettings = config.packageSettings?.filter((s) => Object.keys(s).length > 1);\n}\n"]}
+{"version":3,"file":"writeGeneratedConfig.js","sourceRoot":"","sources":["../../src/writeConfig/writeGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,iFAAiF,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAuB,EACvB,OAAe;IAEf,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;QACpC,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACvC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACnC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,SAAS,CACb,mBAAmB,EACnB;QACE,OAAO,EAAE,2BAA2B;QACpC,GAAG,MAAM;KACV,EACD,EAAE,iBAAiB,EAAE,CACtB,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAuB;IAC1D,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,wBAAwB;IACxB,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnC,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,CAAC,OAAO,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,CAAC,cAAc,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,CAAC,oBAAoB,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,CAAC,oBAAoB,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,CAAC,oBAAoB,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,CAAC,oBAAoB,CAAC;QAChC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC3F,CAAC","sourcesContent":["import type { GeneratedConfig } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport fs from 'fs';\nimport { getConfigPath } from '../getConfigPath.js';\nimport { generatedAppConfigSchemaUrl } from '../constants.js';\nimport { sortGeneratedConfig } from './sortGeneratedConfig.js';\n\n/**\n * Comment added to the top of the generated file (exported for testing only).\n * @internal\n */\nexport const fileHeaderComment = `/**\\n * THIS FILE IS AUTO-GENERATED.\\n * DO NOT MANUALLY EDIT THIS FILE.\\n */\\n`;\n\n/**\n * Clean up the generated config (sort it and remove empty settings) and write it to\n * cloudpack.generated.json. This is used at the end of `init`.\n *\n * If the config file exists but is no longer needed, it will be deleted.\n *\n * @returns\n * - `'written'` if the config was written\n * - `'deleted'` if the config previously existed but is now empty and was deleted\n * - `'no-op'` if the config didn't previously exist and is still empty\n */\nexport async function writeGeneratedConfig(\n  config: GeneratedConfig,\n  appPath: string,\n): Promise<'written' | 'deleted' | 'no-op'> {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  sortGeneratedConfig(config);\n\n  cleanGeneratedConfig(config);\n\n  if (!config.packageSettings?.length) {\n    if (fs.existsSync(generatedConfigPath)) {\n      fs.unlinkSync(generatedConfigPath);\n      return 'deleted';\n    }\n    return 'no-op';\n  }\n\n  await writeJson(\n    generatedConfigPath,\n    {\n      $schema: generatedAppConfigSchemaUrl,\n      ...config,\n    },\n    { fileHeaderComment },\n  );\n  return 'written';\n}\n\n/**\n * Due to optimization, some package settings may end up with empty settings.\n * These would add useless bloat, so filter them out before writing the generated config.\n * This function removes those settings by mutating the input generated config.\n */\nexport function cleanGeneratedConfig(config: GeneratedConfig): void {\n  if (!config.packageSettings) {\n    return;\n  }\n\n  // Remove empty settings\n  config.packageSettings.forEach((s) => {\n    if (s.exports && Object.keys(s.exports).length === 0) {\n      delete s.exports;\n    }\n    if (s.dynamicImports?.length === 0) {\n      delete s.dynamicImports;\n    }\n    if (s.excludedDependencies?.length === 0) {\n      delete s.excludedDependencies;\n    }\n    if (s.includedDependencies?.length === 0) {\n      delete s.includedDependencies;\n    }\n  });\n\n  config.packageSettings = config.packageSettings.filter((s) => Object.keys(s).length > 1);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.35.1",
+  "version": "0.35.3",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,12 +14,12 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.16",
+    "@ms-cloudpack/common-types": "^0.24.17",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/package-utilities": "^12.3.4",
+    "@ms-cloudpack/package-utilities": "^12.3.5",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.1",
+    "@ms-cloudpack/path-utilities": "^3.1.2",
     "semver": "^7.6.0"
   },
   "devDependencies": {