@ms-cloudpack/bundler-ori 0.2.44 → 0.2.45
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.
package/lib/normalizeOutput.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeOutput.js","sourceRoot":"","sources":["../src/normalizeOutput.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,UAAU,eAAe,CAAC,MAI/B;IACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,4EAA4E;QAC5E,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;IACvG,CAAC;IAED,4EAA4E;IAC5E,oEAAoE;IACpE,4EAA4E;IAC5E,MAAM,WAAW,GAAuB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CACxF,CAAC,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1B,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACtC,MAAM,YAAY,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpG,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QACxE,OAAO;YACL,UAAU,EAAE,wBAAwB,CAAC,UAAU,EAAE,aAAa,CAAC;YAC/D,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,wBAAwB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;YACxF,OAAO;SACR,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO;QACL,UAAU;QACV,WAAW;QACX,MAAM,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAChF,QAAQ,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpF,QAAQ,EAAE,KAAgC;QAC1C,SAAS,EAAE,MAA4C;QAEvD,GAAG,CAAC,OAAO,CAAC,WAAW;YACrB,MAAM,CAAC,OAAO,IAAI;YAChB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,KAAK,IAAI,EAAE,CAClB,eAAe,CAAC;gBACd,OAAO;gBACP,KAAK;gBACL,oEAAoE;gBACpE,MAAM,EAAE,MAAM,MAAM,CAAC,OAAQ,EAAE;aAChC,CAAC;SACL,CAAC;KACL,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAI1B;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAE3C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,OAAO,QAAQ;QACb,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAChB,MAAM,MAAM,GAAkB;YAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,KAAK;SACd,CAAC;QAEF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,iBAAiB,CAAC,EAAE,GAAG,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1C,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"normalizeOutput.js","sourceRoot":"","sources":["../src/normalizeOutput.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n BundleMessage,\n BundleMessageLocation,\n BundleOptions,\n BundleOutputFile,\n BundlerResult,\n} from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport type { BuildOptions as OriBuildOptions, BuildResult as OriBuildResult } from 'oribuild';\nimport path from 'path';\n\ntype BuildStatusMessage = OriBuildResult['errors'][number];\n\nexport function normalizeOutput(params: {\n options: BundleOptions;\n input: OriBuildOptions & { absWorkingDir: string };\n output: OriBuildResult;\n}): BundlerResult {\n const { options, input, output } = params;\n const { inputPath } = options;\n const { outdir: outputPath, absWorkingDir } = input;\n if (!outputPath) {\n // This shouldn't be necessary, but assert in case of future code changes...\n throw new Error('Expected ori input.outdir to be set by getOriOptions (this is a bug in Cloudpack)');\n }\n\n // outputs is a dictionary where the key is a path relative to absWorkingDir\n // (which getOriOptions sets to the repo root to work around a bug).\n // We need the BundleOutputFile.outputPath to be relative to the outputPath.\n const outputFiles: BundleOutputFile[] = Object.entries(output.metafile?.outputs || {}).map(\n ([fileOutputPath, entry]) => {\n const { entryPoint, exports } = entry;\n const entryAbsPath = entryPoint !== undefined ? path.resolve(absWorkingDir, entryPoint) : undefined;\n const outputAbsPath = path.resolve(input.absWorkingDir, fileOutputPath);\n return {\n outputPath: normalizedPathRelativeTo(outputPath, outputAbsPath),\n entryPoint: entryAbsPath ? normalizedPathRelativeTo(inputPath, entryAbsPath) : undefined,\n exports,\n };\n },\n );\n\n return {\n outputPath,\n outputFiles,\n errors: normalizeMessages({ inputPath, absWorkingDir, messages: output.errors }),\n warnings: normalizeMessages({ inputPath, absWorkingDir, messages: output.warnings }),\n rawInput: input as Record<string, unknown>,\n rawOutput: output as unknown as Record<string, unknown>,\n\n ...(options.incremental &&\n output.rebuild && {\n dispose: output.dispose,\n rebuild: async () =>\n normalizeOutput({\n options,\n input,\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n output: await output.rebuild!(),\n }),\n }),\n };\n}\n\nfunction normalizeMessages(params: {\n inputPath: string;\n absWorkingDir: string;\n messages?: BuildStatusMessage[];\n}): BundleMessage[] | undefined {\n const { messages, ...pathParams } = params;\n\n const foundMessages = new Set<string>();\n return messages\n ?.map((message) => {\n const result: BundleMessage = {\n text: message.text,\n source: 'ori',\n };\n\n if (message.location) {\n result.location = normalizeLocation({ ...pathParams, location: message.location });\n }\n\n if (message.notes) {\n result.notes = message.notes.map((note) => ({\n text: note.text,\n location: note.location && normalizeLocation({ ...pathParams, location: note.location }),\n }));\n }\n\n if (message.pluginName) {\n // Add the plugin name to the source, since this may be relevant for debugging.\n result.source = `ori ${message.pluginName} plugin`;\n }\n\n // For some reason there can be a duplicate error message for a bad export name (shows up in\n // a test, though not sure if it's seen in the wild?) -- try to dedupe.\n const key = result.text + JSON.stringify(result.location);\n if (foundMessages.has(key)) {\n return undefined;\n }\n foundMessages.add(key);\n\n return result;\n })\n .filter((m) => !!m);\n}\n\nfunction normalizeLocation(params: {\n inputPath: string;\n location: BundleMessageLocation;\n absWorkingDir: string;\n}): BundleMessageLocation {\n const { inputPath, location, absWorkingDir } = params;\n\n const absDir = path.resolve(absWorkingDir, location.file);\n\n return {\n file: normalizeRelativePath(path.relative(inputPath, absDir)),\n line: location.line,\n column: location.column,\n };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/bundler-ori",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.45",
|
|
4
4
|
"description": "An abstraction to bundle source code using ori.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,15 +14,15 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/bundler-capabilities": "^0.2.
|
|
18
|
-
"@ms-cloudpack/bundler-utilities": "^0.3.
|
|
19
|
-
"@ms-cloudpack/common-types": "^0.24.
|
|
17
|
+
"@ms-cloudpack/bundler-capabilities": "^0.2.24",
|
|
18
|
+
"@ms-cloudpack/bundler-utilities": "^0.3.2",
|
|
19
|
+
"@ms-cloudpack/common-types": "^0.24.18",
|
|
20
20
|
"@ms-cloudpack/json-utilities": "^0.1.10",
|
|
21
|
-
"@ms-cloudpack/package-utilities": "^12.3.
|
|
21
|
+
"@ms-cloudpack/package-utilities": "^12.3.7",
|
|
22
22
|
"@ms-cloudpack/path-string-parsing": "^1.2.7",
|
|
23
|
-
"@ms-cloudpack/path-utilities": "^3.1.
|
|
23
|
+
"@ms-cloudpack/path-utilities": "^3.1.3",
|
|
24
24
|
"@ms-cloudpack/retry": "^0.1.3",
|
|
25
|
-
"oribuild": "0.0.0-pre-alpha.15-
|
|
25
|
+
"oribuild": "0.0.0-pre-alpha.15-2025052914-144e2b9"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@ms-cloudpack/bundler-tests": "^0.1.0",
|