@ms-cloudpack/package-utilities 12.2.4 → 12.3.1

package/lib/packageDefinitions/getApiServerTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getApiServerTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAI7E;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAWlE"}
+{"version":3,"file":"getApiServerTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAI7E;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAalE"}

package/lib/packageDefinitions/getApiServerTransform.js

@@ -6,10 +6,14 @@ const apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-stri
  */
 export function getApiServerTransform() {
     return ({ definition }) => {
-        if (definition.name !== '@ms-cloudpack/api-server') {
+        if (definition.name !== '@ms-cloudpack/api-server' || !definition.dependencies) {
             return undefined;
         }
-        definition.dependencies = Object.fromEntries(Object.entries(definition.dependencies || {}).filter(([dep]) => apiServerBrowserDeps.includes(dep)));
+        for (const dep of Object.keys(definition.dependencies)) {
+            if (!apiServerBrowserDeps.includes(dep)) {
+                delete definition.dependencies[dep];
+            }
+        }
         return definition;
     };
 }

package/lib/packageDefinitions/getApiServerTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"getApiServerTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,CAAC,wBAAwB,EAAE,mCAAmC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAEpH;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,IAAI,UAAU,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;YACnD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,UAAU,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAC1C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACpG,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\nconst apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-string-parsing', '@trpc/client', 'zod'];\n\n/**\n * Returns a transform that will update the dependencies of the `@ms-cloudpack/api-server` package\n * to only include the browser dependencies. This reduces the resolve map packages by removing\n * around ~500 server dependencies.\n */\nexport function getApiServerTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    if (definition.name !== '@ms-cloudpack/api-server') {\n      return undefined;\n    }\n\n    definition.dependencies = Object.fromEntries(\n      Object.entries(definition.dependencies || {}).filter(([dep]) => apiServerBrowserDeps.includes(dep)),\n    );\n    return definition;\n  };\n}\n"]}
+{"version":3,"file":"getApiServerTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,CAAC,wBAAwB,EAAE,mCAAmC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAEpH;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,IAAI,UAAU,CAAC,IAAI,KAAK,0BAA0B,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YAC/E,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\nconst apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-string-parsing', '@trpc/client', 'zod'];\n\n/**\n * Returns a transform that will update the dependencies of the `@ms-cloudpack/api-server` package\n * to only include the browser dependencies. This reduces the resolve map packages by removing\n * around ~500 server dependencies.\n */\nexport function getApiServerTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    if (definition.name !== '@ms-cloudpack/api-server' || !definition.dependencies) {\n      return undefined;\n    }\n\n    for (const dep of Object.keys(definition.dependencies)) {\n      if (!apiServerBrowserDeps.includes(dep)) {\n        delete definition.dependencies[dep];\n      }\n    }\n    return definition;\n  };\n}\n"]}

package/lib/packageDefinitions/getTypesTransform.d.ts

@@ -1,7 +1,6 @@
 import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';
 /**
- * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from
- * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.
+ * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.
  */
 export declare function getTypesTransform(): PackageDefinitionTransform;
 //# sourceMappingURL=getTypesTransform.d.ts.map

package/lib/packageDefinitions/getTypesTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTypesTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE7E;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,0BAA0B,CAsB9D"}
+{"version":3,"file":"getTypesTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE7E;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,0BAA0B,CAkB9D"}

package/lib/packageDefinitions/getTypesTransform.js

@@ -1,22 +1,18 @@
 /**
- * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from
- * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.
+ * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.
  */
 export function getTypesTransform() {
     return ({ definition }) => {
-        for (const depType of ['dependencies', 'peerDependencies']) {
+        // Ignore bundle(d)Dependencies since they're so uncommon and unlikely to cause issues if present
+        for (const depType of ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies']) {
             const deps = definition[depType];
             if (!deps) {
                 continue;
             }
             for (const depName of Object.keys(deps)) {
-                if (!depName.startsWith('@types/')) {
-                    continue;
+                if (depName.startsWith('@types/')) {
+                    delete deps[depName];
                 }
-                const depVersion = deps[depName];
-                delete deps[depName];
-                definition.devDependencies ??= {};
-                definition.devDependencies[depName] = depVersion;
             }
         }
         return definition;

package/lib/packageDefinitions/getTypesTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTypesTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAU,EAAE,CAAC;YACpE,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBACnC,SAAS;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC;gBAClC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;YACnD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\n/**\n * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from\n * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.\n */\nexport function getTypesTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    for (const depType of ['dependencies', 'peerDependencies'] as const) {\n      const deps = definition[depType];\n      if (!deps) {\n        continue;\n      }\n\n      for (const depName of Object.keys(deps)) {\n        if (!depName.startsWith('@types/')) {\n          continue;\n        }\n\n        const depVersion = deps[depName];\n        delete deps[depName];\n        definition.devDependencies ??= {};\n        definition.devDependencies[depName] = depVersion;\n      }\n    }\n\n    return definition;\n  };\n}\n"]}
+{"version":3,"file":"getTypesTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,iGAAiG;QACjG,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,CAAU,EAAE,CAAC;YAC/G,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\n/**\n * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.\n */\nexport function getTypesTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    // Ignore bundle(d)Dependencies since they're so uncommon and unlikely to cause issues if present\n    for (const depType of ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'] as const) {\n      const deps = definition[depType];\n      if (!deps) {\n        continue;\n      }\n\n      for (const depName of Object.keys(deps)) {\n        if (depName.startsWith('@types/')) {\n          delete deps[depName];\n        }\n      }\n    }\n\n    return definition;\n  };\n}\n"]}

package/lib/packageJson/getUnusedDependencies.d.ts

@@ -1,8 +1,4 @@
 import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';
-/**
- * Get the extra dependencies that cloudpack doesn't consider for bundling by default:
- * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't
- * be used at runtime.
- */
+/** @deprecated Not used; to be deleted in v13+ */
 export declare function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies;
 //# sourceMappingURL=getUnusedDependencies.d.ts.map

package/lib/packageJson/getUnusedDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUnusedDependencies.d.ts","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,GAAG,uBAAuB,CAStF"}
+{"version":3,"file":"getUnusedDependencies.d.ts","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,kDAAkD;AAClD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,GAAG,uBAAuB,CAStF"}

package/lib/packageJson/getUnusedDependencies.js

@@ -1,8 +1,4 @@
-/**
- * Get the extra dependencies that cloudpack doesn't consider for bundling by default:
- * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't
- * be used at runtime.
- */
+/** @deprecated Not used; to be deleted in v13+ */
 export function getUnusedDependencies(definition) {
     // This is very simple but needs to be consistent between multiple places,
     // especially in case it needs to be changed somehow later.

package/lib/packageJson/getUnusedDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUnusedDependencies.js","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAuB;IAC3D,0EAA0E;IAC1E,2DAA2D;IAC3D,OAAO;QACL,GAAG,UAAU,CAAC,eAAe;QAC7B,GAAG,2BAA2B,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC7D,GAAG,2BAA2B,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC9D,GAAG,UAAU,CAAC,oBAAoB;KACnC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,SAAS,2BAA2B,CAClC,YAA4D;IAE5D,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAChH,CAAC","sourcesContent":["import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';\n\n/**\n * Get the extra dependencies that cloudpack doesn't consider for bundling by default:\n * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't\n * be used at runtime.\n */\nexport function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies {\n  // This is very simple but needs to be consistent between multiple places,\n  // especially in case it needs to be changed somehow later.\n  return {\n    ...definition.devDependencies,\n    ...normalizeBundleDependencies(definition.bundleDependencies),\n    ...normalizeBundleDependencies(definition.bundledDependencies),\n    ...definition.optionalDependencies,\n  };\n}\n\n/** If the bundle(d) dependencies are an array, normalize them to an object. */\nfunction normalizeBundleDependencies(\n  dependencies: PackageJsonDependencies | string[] | undefined,\n): PackageJsonDependencies | undefined {\n  return Array.isArray(dependencies) ? Object.fromEntries(dependencies.map((dep) => [dep, '*'])) : dependencies;\n}\n"]}
+{"version":3,"file":"getUnusedDependencies.js","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,MAAM,UAAU,qBAAqB,CAAC,UAAuB;IAC3D,0EAA0E;IAC1E,2DAA2D;IAC3D,OAAO;QACL,GAAG,UAAU,CAAC,eAAe;QAC7B,GAAG,2BAA2B,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC7D,GAAG,2BAA2B,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC9D,GAAG,UAAU,CAAC,oBAAoB;KACnC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,SAAS,2BAA2B,CAClC,YAA+C;IAE/C,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAChH,CAAC","sourcesContent":["import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';\n\n/** @deprecated Not used; to be deleted in v13+ */\nexport function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies {\n  // This is very simple but needs to be consistent between multiple places,\n  // especially in case it needs to be changed somehow later.\n  return {\n    ...definition.devDependencies,\n    ...normalizeBundleDependencies(definition.bundleDependencies),\n    ...normalizeBundleDependencies(definition.bundledDependencies),\n    ...definition.optionalDependencies,\n  };\n}\n\n/** If the bundle(d) dependencies are an array, normalize them to an object. */\nfunction normalizeBundleDependencies(\n  dependencies: PackageJson['bundleDependencies'],\n): PackageJsonDependencies | undefined {\n  return Array.isArray(dependencies) ? Object.fromEntries(dependencies.map((dep) => [dep, '*'])) : dependencies;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "12.2.4",
+  "version": "12.3.1",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -18,7 +18,7 @@
     "@ms-cloudpack/json-utilities": "^0.1.10",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
     "@ms-cloudpack/path-utilities": "^3.0.13",
-    "@ms-cloudpack/task-reporter": "^0.16.1",
+    "@ms-cloudpack/task-reporter": "^0.16.2",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",
     "fast-glob": "^3.2.12",