@ms-cloudpack/bundler 0.17.9 → 0.17.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAiB,aAAa,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAM9F;;;GAGG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAgFhH"}
1
+ {"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAiB,aAAa,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAM9F;;;GAGG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAkFhH"}
package/lib/bundle.js CHANGED
@@ -3,7 +3,7 @@ import {} from '@ms-cloudpack/config-types';
3
3
  import { writeJson } from '@ms-cloudpack/json-utilities';
4
4
  import path from 'path';
5
5
  import { detectModuleType } from '@ms-cloudpack/package-utilities';
6
- import { sourceExtensions } from '@ms-cloudpack/path-utilities';
6
+ import { sourceExtensions, typescriptExtensions } from '@ms-cloudpack/path-utilities';
7
7
  /**
8
8
  * Abstracted consumer input to the bundle method for the appropriate bundler. Provides a more
9
9
  * advanced api surface.
@@ -42,8 +42,9 @@ export async function bundle(options, context) {
42
42
  const moduleType = firstSourceEntry
43
43
  ? await detectModuleType(path.resolve(options.inputPath, firstSourceEntry))
44
44
  : undefined;
45
+ const isTypescript = firstSourceEntry ? typescriptExtensions.includes(path.extname(firstSourceEntry)) : false;
45
46
  const { outputPath = options.inputPath } = options;
46
- const bundler = await chooseBundler(options, { moduleType });
47
+ const bundler = await chooseBundler({ bundlerType: options.bundlerType, moduleType, isTypescript });
47
48
  let result = undefined;
48
49
  try {
49
50
  result = await bundler.bundle(options, { ...context, moduleType });
package/lib/bundle.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { chooseBundler } from './chooseBundler.js';\nimport { type CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { BundleMessage, BundleOptions, BundleResult } from '@ms-cloudpack/bundler-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport { detectModuleType } from '@ms-cloudpack/package-utilities';\nimport { sourceExtensions } from '@ms-cloudpack/path-utilities';\n\n/**\n * Abstracted consumer input to the bundle method for the appropriate bundler. Provides a more\n * advanced api surface.\n */\nexport async function bundle(options: BundleOptions, context: { config: CloudpackConfig }): Promise<BundleResult> {\n const configErrors: BundleMessage[] = [];\n\n if (!options.inputPath?.length) {\n configErrors.push({\n type: 'invalid-input',\n text: 'No input path provided to bundle.',\n });\n } else if (!path.isAbsolute(options.inputPath)) {\n configErrors.push({\n type: 'input-relative',\n text: 'Input path must be absolute.',\n });\n }\n\n if (!Object.keys(options.entries || {}).length) {\n configErrors.push({\n type: 'no-entries',\n text: `No entries provided to bundle at inputPath \"${options.inputPath}\".`,\n });\n } else if (Object.entries(options.entries).some(([k, v]) => path.isAbsolute(k) || path.isAbsolute(v))) {\n configErrors.push({\n type: 'entry-absolute',\n text: `Entry paths must be relative.`,\n });\n }\n\n if (configErrors.length) {\n return { errors: configErrors };\n }\n\n // Choose the bundler type and bundle.\n const firstSourceEntry = Object.values(options.entries).find((fileName) =>\n sourceExtensions.includes(path.extname(fileName)),\n );\n const moduleType = firstSourceEntry\n ? await detectModuleType(path.resolve(options.inputPath, firstSourceEntry))\n : undefined;\n const { outputPath = options.inputPath } = options;\n const bundler = await chooseBundler(options, { moduleType });\n let result: BundleResult | undefined = undefined;\n\n try {\n result = await bundler.bundle(options, { ...context, moduleType });\n } catch (e) {\n result = {\n bundlerName: bundler.name,\n inputPath: options.inputPath,\n entries: options.entries,\n errors: [\n {\n text: `Unexpected exception: ${e}`,\n },\n ],\n };\n } finally {\n const { errors, rawInput, rawOutput } = result || {};\n\n await Promise.all([\n errors?.length && writeJson(path.join(outputPath, `${bundler.name}-errors.json`), errors),\n rawInput && writeJson(path.join(outputPath, `${bundler.name}-input.json`), rawInput),\n rawOutput && writeJson(path.join(outputPath, `${bundler.name}-output.json`), rawOutput),\n ]);\n\n // Clear raw input and output from the result returned to eliminate excessive memory usage.\n if (result) {\n result.rawInput = result.rawOutput = undefined;\n }\n }\n\n for (const outputFile of result.outputFiles || []) {\n outputFile.outputPath = path.relative(outputPath, outputFile.outputPath);\n }\n\n return {\n bundlerName: bundler.name,\n inputPath: options.inputPath,\n entries: options.entries,\n ...(result as Partial<BundleResult>),\n };\n}\n"]}
1
+ {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { chooseBundler } from './chooseBundler.js';\nimport { type CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { BundleMessage, BundleOptions, BundleResult } from '@ms-cloudpack/bundler-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport { detectModuleType } from '@ms-cloudpack/package-utilities';\nimport { sourceExtensions, typescriptExtensions } from '@ms-cloudpack/path-utilities';\n\n/**\n * Abstracted consumer input to the bundle method for the appropriate bundler. Provides a more\n * advanced api surface.\n */\nexport async function bundle(options: BundleOptions, context: { config: CloudpackConfig }): Promise<BundleResult> {\n const configErrors: BundleMessage[] = [];\n\n if (!options.inputPath?.length) {\n configErrors.push({\n type: 'invalid-input',\n text: 'No input path provided to bundle.',\n });\n } else if (!path.isAbsolute(options.inputPath)) {\n configErrors.push({\n type: 'input-relative',\n text: 'Input path must be absolute.',\n });\n }\n\n if (!Object.keys(options.entries || {}).length) {\n configErrors.push({\n type: 'no-entries',\n text: `No entries provided to bundle at inputPath \"${options.inputPath}\".`,\n });\n } else if (Object.entries(options.entries).some(([k, v]) => path.isAbsolute(k) || path.isAbsolute(v))) {\n configErrors.push({\n type: 'entry-absolute',\n text: `Entry paths must be relative.`,\n });\n }\n\n if (configErrors.length) {\n return { errors: configErrors };\n }\n\n // Choose the bundler type and bundle.\n const firstSourceEntry = Object.values(options.entries).find((fileName) =>\n sourceExtensions.includes(path.extname(fileName)),\n );\n const moduleType = firstSourceEntry\n ? await detectModuleType(path.resolve(options.inputPath, firstSourceEntry))\n : undefined;\n const isTypescript = firstSourceEntry ? typescriptExtensions.includes(path.extname(firstSourceEntry)) : false;\n\n const { outputPath = options.inputPath } = options;\n const bundler = await chooseBundler({ bundlerType: options.bundlerType, moduleType, isTypescript });\n let result: BundleResult | undefined = undefined;\n\n try {\n result = await bundler.bundle(options, { ...context, moduleType });\n } catch (e) {\n result = {\n bundlerName: bundler.name,\n inputPath: options.inputPath,\n entries: options.entries,\n errors: [\n {\n text: `Unexpected exception: ${e}`,\n },\n ],\n };\n } finally {\n const { errors, rawInput, rawOutput } = result || {};\n\n await Promise.all([\n errors?.length && writeJson(path.join(outputPath, `${bundler.name}-errors.json`), errors),\n rawInput && writeJson(path.join(outputPath, `${bundler.name}-input.json`), rawInput),\n rawOutput && writeJson(path.join(outputPath, `${bundler.name}-output.json`), rawOutput),\n ]);\n\n // Clear raw input and output from the result returned to eliminate excessive memory usage.\n if (result) {\n result.rawInput = result.rawOutput = undefined;\n }\n }\n\n for (const outputFile of result.outputFiles || []) {\n outputFile.outputPath = path.relative(outputPath, outputFile.outputPath);\n }\n\n return {\n bundlerName: bundler.name,\n inputPath: options.inputPath,\n entries: options.entries,\n ...(result as Partial<BundleResult>),\n };\n}\n"]}
@@ -1,11 +1,12 @@
1
- import type { Bundler, BundleOptions } from '@ms-cloudpack/bundler-types';
1
+ import type { Bundler } from '@ms-cloudpack/bundler-types';
2
2
  import type { ModuleType } from '@ms-cloudpack/package-utilities';
3
3
  /**
4
- * Mediates which bundler to use.
5
- * @param options Bundler options, defining what we expect to bundle and how.
4
+ * Determines which bundler to use.
6
5
  * @returns A bundler plugin.
7
6
  */
8
- export declare function chooseBundler(options: BundleOptions, context: {
7
+ export declare function chooseBundler(params: {
8
+ bundlerType: string | undefined;
9
9
  moduleType: ModuleType;
10
+ isTypescript: boolean;
10
11
  }): Promise<Bundler>;
11
12
  //# sourceMappingURL=chooseBundler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"chooseBundler.d.ts","sourceRoot":"","sources":["../src/chooseBundler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAcjH"}
1
+ {"version":3,"file":"chooseBundler.d.ts","sourceRoot":"","sources":["../src/chooseBundler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAGlE;;;GAGG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CAanB"}
@@ -1,15 +1,13 @@
1
1
  import { allBundlers } from './allBundlers.js';
2
2
  /**
3
- * Mediates which bundler to use.
4
- * @param options Bundler options, defining what we expect to bundle and how.
3
+ * Determines which bundler to use.
5
4
  * @returns A bundler plugin.
6
5
  */
7
- export async function chooseBundler(options, context) {
8
- const { bundlerType } = options;
9
- const { moduleType } = context;
6
+ export async function chooseBundler(params) {
7
+ const { bundlerType, moduleType, isTypescript } = params;
10
8
  const { rollup, ori } = allBundlers;
11
9
  if (!bundlerType || bundlerType === 'auto') {
12
- if (moduleType === 'cjs') {
10
+ if (moduleType === 'cjs' && !isTypescript) {
13
11
  return await rollup();
14
12
  }
15
13
  return await ori();
@@ -1 +1 @@
1
- {"version":3,"file":"chooseBundler.js","sourceRoot":"","sources":["../src/chooseBundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAsB,EAAE,OAAmC;IAC7F,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAEpC,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,MAAM,EAAE;QAC1C,IAAI,UAAU,KAAK,KAAK,EAAE;YACxB,OAAO,MAAM,MAAM,EAAE,CAAC;SACvB;QAED,OAAO,MAAM,GAAG,EAAE,CAAC;KACpB;IAED,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;AAC1C,CAAC","sourcesContent":["import type { Bundler, BundleOptions } from '@ms-cloudpack/bundler-types';\nimport { allBundlers } from './allBundlers.js';\nimport type { ModuleType } from '@ms-cloudpack/package-utilities';\n\n/**\n * Mediates which bundler to use.\n * @param options Bundler options, defining what we expect to bundle and how.\n * @returns A bundler plugin.\n */\nexport async function chooseBundler(options: BundleOptions, context: { moduleType: ModuleType }): Promise<Bundler> {\n const { bundlerType } = options;\n const { moduleType } = context;\n const { rollup, ori } = allBundlers;\n\n if (!bundlerType || bundlerType === 'auto') {\n if (moduleType === 'cjs') {\n return await rollup();\n }\n\n return await ori();\n }\n\n return await allBundlers[bundlerType]();\n}\n"]}
1
+ {"version":3,"file":"chooseBundler.js","sourceRoot":"","sources":["../src/chooseBundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAInC;IACC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAEpC,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,MAAM,EAAE;QAC1C,IAAI,UAAU,KAAK,KAAK,IAAI,CAAC,YAAY,EAAE;YACzC,OAAO,MAAM,MAAM,EAAE,CAAC;SACvB;QAED,OAAO,MAAM,GAAG,EAAE,CAAC;KACpB;IAED,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;AAC1C,CAAC","sourcesContent":["import type { Bundler } from '@ms-cloudpack/bundler-types';\nimport type { ModuleType } from '@ms-cloudpack/package-utilities';\nimport { allBundlers } from './allBundlers.js';\n\n/**\n * Determines which bundler to use.\n * @returns A bundler plugin.\n */\nexport async function chooseBundler(params: {\n bundlerType: string | undefined;\n moduleType: ModuleType;\n isTypescript: boolean;\n}): Promise<Bundler> {\n const { bundlerType, moduleType, isTypescript } = params;\n const { rollup, ori } = allBundlers;\n\n if (!bundlerType || bundlerType === 'auto') {\n if (moduleType === 'cjs' && !isTypescript) {\n return await rollup();\n }\n\n return await ori();\n }\n\n return await allBundlers[bundlerType]();\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ms-cloudpack/bundler",
3
- "version": "0.17.9",
3
+ "version": "0.17.11",
4
4
  "description": "An abstraction to bundle source code.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -15,14 +15,14 @@
15
15
  },
16
16
  "dependencies": {
17
17
  "@ms-cloudpack/json-utilities": "^0.1.3",
18
- "@ms-cloudpack/bundler-plugin-ori": "^0.14.6",
19
- "@ms-cloudpack/bundler-plugin-rollup": "^0.8.8",
20
- "@ms-cloudpack/bundler-types": "^0.23.6",
21
- "@ms-cloudpack/config": "^0.17.9",
22
- "@ms-cloudpack/config-types": "^0.3.1",
23
- "@ms-cloudpack/package-utilities": "^5.7.3",
24
- "@ms-cloudpack/path-string-parsing": "^1.1.2",
25
- "@ms-cloudpack/path-utilities": "^2.4.1"
18
+ "@ms-cloudpack/bundler-plugin-ori": "^0.14.7",
19
+ "@ms-cloudpack/bundler-plugin-rollup": "^0.8.10",
20
+ "@ms-cloudpack/bundler-types": "^0.23.7",
21
+ "@ms-cloudpack/config": "^0.17.11",
22
+ "@ms-cloudpack/config-types": "^0.3.2",
23
+ "@ms-cloudpack/package-utilities": "^5.7.5",
24
+ "@ms-cloudpack/path-string-parsing": "^1.1.3",
25
+ "@ms-cloudpack/path-utilities": "^2.4.2"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@ms-cloudpack/eslint-plugin-internal": "*",